diff options
| author | Rafael J. Wysocki | 2017-06-22 16:28:35 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki | 2017-06-22 16:28:35 +0200 |
| commit | d07ff6523b1ed24d636365f8479b0db70946dc14 (patch) | |
| tree | 802bf35ed93ee4941e193cac24d0888af917913e /include/linux/pci-acpi.h | |
| parent | ACPI / PM: Ignore spurious SCI wakeups from suspend-to-idle (diff) | |
| parent | thermal: int340x_thermal: fix compile after the UUID API switch (diff) | |
| download | kernel-qcow2-linux-d07ff6523b1ed24d636365f8479b0db70946dc14.tar.gz kernel-qcow2-linux-d07ff6523b1ed24d636365f8479b0db70946dc14.tar.xz kernel-qcow2-linux-d07ff6523b1ed24d636365f8479b0db70946dc14.zip | |
Merge branch 'uuid-types'
Merge branch 'uuid-types' from git://git.infradead.org/users/hch/uuid.git
to satisfy dependencies.
Diffstat (limited to 'include/linux/pci-acpi.h')
| -rw-r--r-- | include/linux/pci-acpi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pci-acpi.h b/include/linux/pci-acpi.h index 7a4e83a8c89c..dd86c97f2454 100644 --- a/include/linux/pci-acpi.h +++ b/include/linux/pci-acpi.h @@ -105,7 +105,7 @@ static inline void acpiphp_remove_slots(struct pci_bus *bus) { } static inline void acpiphp_check_host_bridge(struct acpi_device *adev) { } #endif -extern const u8 pci_acpi_dsm_uuid[]; +extern const guid_t pci_acpi_dsm_guid; #define DEVICE_LABEL_DSM 0x07 #define RESET_DELAY_DSM 0x08 #define FUNCTION_DELAY_DSM 0x09 |