From cd37e61ea56f9cf1cb10f12858022b3c758c7b44 Mon Sep 17 00:00:00 2001
From: Len Brown <len.brown@intel.com>
Date: Fri, 12 Jun 2009 20:42:08 -0400
Subject: [PATCH] --- yaml --- r: 154173 b: refs/heads/master c:
 4a7a16dc061e4c57bf288150f51bd4c2ace33723 h: refs/heads/master i:   154171:
 1f773611a2557510730e496e62f430927cb15503 v: v3

---
 [refs]                     | 2 +-
 trunk/include/linux/acpi.h | 3 +++
 trunk/init/main.c          | 6 +-----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 31666da0e1e8..782e62c6fabd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4bf2f372db09ef8d16a25a60d523bfa1c50f7b5
+refs/heads/master: 4a7a16dc061e4c57bf288150f51bd4c2ace33723
diff --git a/trunk/include/linux/acpi.h b/trunk/include/linux/acpi.h
index 73cb141150df..bf17681cb06f 100644
--- a/trunk/include/linux/acpi.h
+++ b/trunk/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/trunk/init/main.c b/trunk/init/main.c
index d721dad05dd7..f1b9f0fdb1b4 100644
--- a/trunk/init/main.c
+++ b/trunk/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