diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-02-21 01:06:58 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-02-21 01:06:58 +0100 |
| commit | 2bd74d91b1217d84d08db57b860d056d130248d3 (patch) | |
| tree | 6333daab84310e75200be4c3dc511b7e4baa1f42 /include/linux | |
| parent | ae3caa80a5d532d334c7a4785d74104e3de5a9ae (diff) | |
| parent | cc6254e00eb676dda6501655f8185aef7b761b4f (diff) | |
Merge branch 'acpi-pci-hotplug' into acpi-ost
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 */ |