aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-06-12 20:42:08 -0400
committerLen Brown <len.brown@intel.com>2009-06-12 20:50:38 -0400
commit4a7a16dc061e4c57bf288150f51bd4c2ace33723 (patch)
tree34bd1b25321269b8ad8a172e03655db2a28ecca7
parentc4bf2f372db09ef8d16a25a60d523bfa1c50f7b5 (diff)
downloadmrst-s0i3-test-4a7a16dc061e4c57bf288150f51bd4c2ace33723.tar.gz
mrst-s0i3-test-4a7a16dc061e4c57bf288150f51bd4c2ace33723.tar.xz
mrst-s0i3-test-4a7a16dc061e4c57bf288150f51bd4c2ace33723.zip
ACPI: move declaration acpi_early_init() to acpi.h
Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--include/linux/acpi.h3
-rw-r--r--init/main.c6
2 files changed, 4 insertions, 5 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 73cb141150d..bf17681cb06 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -290,7 +290,10 @@ void __init acpi_s4_no_nvs(void);
OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL)
extern acpi_status acpi_pci_osc_control_set(acpi_handle handle, u32 flags);
+extern void acpi_early_init(void);
+
#else /* CONFIG_ACPI */
+static inline void acpi_early_init(void) { }
static inline int early_acpi_boot_init(void)
{
diff --git a/init/main.c b/init/main.c
index d721dad05dd..f1b9f0fdb1b 100644
--- a/init/main.c
+++ b/init/main.c
@@ -24,6 +24,7 @@
#include <linux/smp_lock.h>
#include <linux/initrd.h>
#include <linux/bootmem.h>
+#include <linux/acpi.h>
#include <linux/tty.h>
#include <linux/gfp.h>
#include <linux/percpu.h>
@@ -86,11 +87,6 @@ extern void sbus_init(void);
extern void prio_tree_init(void);
extern void radix_tree_init(void);
extern void free_initmem(void);
-#ifdef CONFIG_ACPI
-extern void acpi_early_init(void);
-#else
-static inline void acpi_early_init(void) { }
-#endif
#ifndef CONFIG_DEBUG_RODATA
static inline void mark_rodata_ro(void) { }
#endif