Merge branch 'acpi-hotplug'

[linux-imx.git] / drivers / acpi / internal.h

diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index bf792595132cb586aabd761a79d0eb68a00eef60..520073ba36b497bf47cb6835aaa4f7a8b0897b4a 100644 (file)
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -36,12 +36,16 @@ void acpi_pci_root_hp_init(void);
 void acpi_processor_init(void);
 void acpi_platform_init(void);
 int acpi_sysfs_init(void);
-void acpi_csrt_init(void);
 #ifdef CONFIG_ACPI_CONTAINER
 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