diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-25 22:46:47 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-25 22:46:47 +0200 |
commit | 96c9ddae034a301bbd32c52da5c972778d73ad2e (patch) | |
tree | 25ca63815efbe874ec2140efd7b6ad034afea387 /drivers/acpi/internal.h | |
parent | 9e895ace5d82df8929b16f58e9f515f6d54ab82d (diff) | |
parent | 44521527be36172864e6e7a6fba4b66e9aa48e40 (diff) |
Merge branch 'acpi-fixes'
* acpi-fixes:
libata-acpi: add back ACPI based hotplug functionality
ACPI / dock / PCI: Synchronous handling of dock events for PCI devices
PCI / ACPI: Use boot-time resource allocation rules during hotplug
ACPI / dock: Initialize ACPI dock subsystem upfront
Diffstat (limited to 'drivers/acpi/internal.h')
-rw-r--r-- | drivers/acpi/internal.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h index 297cbf456f86..c610a76d92c4 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h @@ -40,6 +40,11 @@ void acpi_container_init(void); #else static inline void acpi_container_init(void) {} #endif +#ifdef CONFIG_ACPI_DOCK +void acpi_dock_init(void); +#else +static inline void acpi_dock_init(void) {} +#endif #ifdef CONFIG_ACPI_HOTPLUG_MEMORY void acpi_memory_hotplug_init(void); #else |