diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-02-12 12:56:56 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-02-12 12:56:56 +0100 |
| commit | 4b49b9fe2b5220374ddc1c122cc31e00cc20365f (patch) | |
| tree | d8c3c3ff835da7238cc0b1d6817f7bcf5b735ecd /include/linux | |
| parent | 7282059489868e0ed1b0d79765730c6b233a8399 (diff) | |
| parent | 21369c77477a7f937174833c8094154f0f995710 (diff) | |
| download | cachepc-linux-4b49b9fe2b5220374ddc1c122cc31e00cc20365f.tar.gz cachepc-linux-4b49b9fe2b5220374ddc1c122cc31e00cc20365f.zip | |
Merge back earlier 'acpi-pci-hotplug' material.
Conflicts:
drivers/pci/hotplug/acpiphp_glue.c
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pci-acpi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/pci-acpi.h b/include/linux/pci-acpi.h index 5a462c4e5009..637a608ded0b 100644 --- a/include/linux/pci-acpi.h +++ b/include/linux/pci-acpi.h @@ -59,12 +59,12 @@ static inline void acpi_pci_slot_remove(struct pci_bus *bus) { } void acpiphp_init(void); void acpiphp_enumerate_slots(struct pci_bus *bus); void acpiphp_remove_slots(struct pci_bus *bus); -void acpiphp_check_host_bridge(acpi_handle handle); +void acpiphp_check_host_bridge(struct acpi_device *adev); #else static inline void acpiphp_init(void) { } static inline void acpiphp_enumerate_slots(struct pci_bus *bus) { } static inline void acpiphp_remove_slots(struct pci_bus *bus) { } -static inline void acpiphp_check_host_bridge(acpi_handle handle) { } +static inline void acpiphp_check_host_bridge(struct acpi_device *adev) { } #endif #else /* CONFIG_ACPI */ |