diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-17 08:47:04 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-17 08:47:04 -0400 |
| commit | d983f93328041f85e884a586810a67528ae59945 (patch) | |
| tree | cee4bb57846b237dc63bd111fa2ffe6cbcdc7cba /include/linux | |
| parent | dcb99fd9b08cfe1afe426af4d8d3cbc429190f15 (diff) | |
| parent | b8a62d540240387c7e97a69127cab3ab9cadc70a (diff) | |
Merge branch 'acpi-pci-hotplug'
* acpi-pci-hotplug: (23 commits)
ACPI / hotplug / PCI: Use pci_device_is_present()
ACPI / hotplug / PCI: Add ACPIPHP contexts to devices handled by PCIeHP
ACPI / hotplug / PCI: Rename register_slot() to acpiphp_add_context()
ACPI / hotplug / PCI: Execute _EJ0 under the ACPI scan lock
ACPI / hotplug / PCI: Rework acpiphp_check_host_bridge()
ACPI / hotplug / PCI: Hotplug notifications from acpi_bus_notify()
ACPI / hotplug / PCI: Simplify acpi_install_hotplug_notify_handler()
ACPI / hotplug / PCI: Rework the handling of eject requests
ACPI / hotplug / PCI: Consolidate ACPIPHP with ACPI core hotplug
ACPI / hotplug / PCI: Define hotplug context lock in the core
ACPI / hotplug: Fix potential race in acpi_bus_notify()
ACPICA: Introduce acpi_get_data_full() and rework acpi_get_data()
ACPI / hotplug / PCI: Do not pass ACPI handle to hotplug_event()
ACPI / hotplug / PCI: Use acpi_handle_debug() in hotplug_event()
ACPI / hotplug / PCI: Simplify hotplug_event()
ACPI / hotplug / PCI: Drop crit_sect locking
ACPI / hotplug / PCI: Drop acpiphp_bus_add()
ACPI / hotplug / PCI: Store acpi_device pointer in acpiphp_context
ACPI / hotplug / PCI: Rework acpiphp_no_hotplug()
ACPI / hotplug / PCI: Drop acpiphp_bus_trim()
...
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) { } | |||
| 59 | void acpiphp_init(void); | 59 | void acpiphp_init(void); |
| 60 | void acpiphp_enumerate_slots(struct pci_bus *bus); | 60 | void acpiphp_enumerate_slots(struct pci_bus *bus); |
| 61 | void acpiphp_remove_slots(struct pci_bus *bus); | 61 | void acpiphp_remove_slots(struct pci_bus *bus); |
| 62 | void acpiphp_check_host_bridge(acpi_handle handle); | 62 | void acpiphp_check_host_bridge(struct acpi_device *adev); |
| 63 | #else | 63 | #else |
| 64 | static inline void acpiphp_init(void) { } | 64 | static inline void acpiphp_init(void) { } |
| 65 | static inline void acpiphp_enumerate_slots(struct pci_bus *bus) { } | 65 | static inline void acpiphp_enumerate_slots(struct pci_bus *bus) { } |
| 66 | static inline void acpiphp_remove_slots(struct pci_bus *bus) { } | 66 | static inline void acpiphp_remove_slots(struct pci_bus *bus) { } |
| 67 | static inline void acpiphp_check_host_bridge(acpi_handle handle) { } | 67 | static inline void acpiphp_check_host_bridge(struct acpi_device *adev) { } |
| 68 | #endif | 68 | #endif |
| 69 | 69 | ||
| 70 | #else /* CONFIG_ACPI */ | 70 | #else /* CONFIG_ACPI */ |