From 8bdfb126f687a664f41000485b5d086cf6cdd92b Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 23 Feb 2011 11:46:01 +0100
Subject: [PATCH] --- yaml --- r: 234918 b: refs/heads/master c:
 939d578ecc62b07efeb186576ab190fe0b766501 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/x86/include/asm/olpc_ofw.h | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0f5c617531fc..777d71047627 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2a941fadb57d157d59eec424674bd0c3a28788c
+refs/heads/master: 939d578ecc62b07efeb186576ab190fe0b766501
diff --git a/trunk/arch/x86/include/asm/olpc_ofw.h b/trunk/arch/x86/include/asm/olpc_ofw.h
index 28a7fec01100..c5d3a5abbb9f 100644
--- a/trunk/arch/x86/include/asm/olpc_ofw.h
+++ b/trunk/arch/x86/include/asm/olpc_ofw.h
@@ -6,6 +6,8 @@
 
 #define OLPC_OFW_SIG 0x2057464F	/* aka "OFW " */
 
+#ifdef CONFIG_OLPC
+
 extern bool olpc_ofw_is_installed(void);
 
 /* run an OFW command by calling into the firmware */
@@ -24,6 +26,11 @@ extern void setup_olpc_ofw_pgd(void);
 /* check if OFW was detected during boot */
 extern bool olpc_ofw_present(void);
 
+#else /* !CONFIG_OLPC */
+static inline void olpc_ofw_detect(void) { }
+static inline void setup_olpc_ofw_pgd(void) { }
+#endif /* !CONFIG_OLPC */
+
 #ifdef CONFIG_OF_PROMTREE
 extern void olpc_dt_build_devicetree(void);
 #else