diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-07 19:31:15 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-07 19:31:15 +0100 |
| commit | 63ff4d0765a4e30afa659edbf09006987fc62499 (patch) | |
| tree | fb9f64c4510ea08e076c715c87dd61b3d79f99d6 /include/acpi/platform/aclinux.h | |
| parent | 679d9980f9914136f6e488d976eb412de156c542 (diff) | |
| parent | 7b98118aaa5d75644c48f41fc5d0cc181e478383 (diff) | |
| download | op-kernel-dev-63ff4d0765a4e30afa659edbf09006987fc62499.zip op-kernel-dev-63ff4d0765a4e30afa659edbf09006987fc62499.tar.gz | |
Merge branch 'acpi-hotplug'
* acpi-hotplug:
ACPI / hotplug: Consolidate deferred execution of ACPI hotplug routines
ACPI / hotplug: Do not execute "insert in progress" _OST
ACPI / hotplug: Carry out PCI root eject directly
ACPI / hotplug: Merge device hot-removal routines
ACPI / hotplug: Make acpi_bus_hot_remove_device() internal
ACPI / hotplug: Simplify device ejection routines
ACPI / hotplug: Fix handle_root_bridge_removal()
ACPI / hotplug: Refuse to hot-remove all objects with disabled hotplug
ACPI / scan: Start matching drivers after trying scan handlers
ACPI: Remove acpi_pci_slot_init() headers from internal.h
Conflicts:
include/acpi/acpiosxf.h (with the 'acpica' branch)
Diffstat (limited to 'include/acpi/platform/aclinux.h')
| -rw-r--r-- | include/acpi/platform/aclinux.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h index ab57930..28f4f4d 100644 --- a/include/acpi/platform/aclinux.h +++ b/include/acpi/platform/aclinux.h @@ -243,9 +243,6 @@ void acpi_os_gpe_count(u32 gpe_number); void acpi_os_fixed_event_count(u32 fixed_event_number); -acpi_status -acpi_os_hotplug_execute(acpi_osd_exec_callback function, void *context); - #endif /* __KERNEL__ */ #endif /* __ACLINUX_H__ */ |
