Merge remote-tracking branch 'tip/auto-latest'

[deliverable/linux.git] / include / linux / acpi.h

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index e7465528b8dcfe52de57663cfb5aedb3b8ed229c..6d0816ba84d880af4013c25c46db35f2a0dce1d6 100644 (file)
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -758,6 +758,12 @@ static inline int acpi_reconfig_notifier_unregister(struct notifier_block *nb)
 
 #endif /* !CONFIG_ACPI */
 
+#ifdef CONFIG_ACPI_HOTPLUG_IOAPIC
+int acpi_ioapic_add(acpi_handle root);
+#else
+static inline int acpi_ioapic_add(acpi_handle root) { return 0; }
+#endif
+
 #ifdef CONFIG_ACPI
 void acpi_os_set_prepare_sleep(int (*func)(u8 sleep_state,
                               u32 pm1a_ctrl,  u32 pm1b_ctrl));