aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-02-23 11:46:01 +0100
committerThomas Gleixner <tglx@linutronix.de>2011-02-23 11:54:02 +0100
commit939d578ecc62b07efeb186576ab190fe0b766501 (patch)
treed7ae552d240e6047e968ee53fc47355457f602e3 /arch/x86/include/asm
parentc2a941fadb57d157d59eec424674bd0c3a28788c (diff)
downloadkernel_samsung_tuna-939d578ecc62b07efeb186576ab190fe0b766501.zip
kernel_samsung_tuna-939d578ecc62b07efeb186576ab190fe0b766501.tar.gz
kernel_samsung_tuna-939d578ecc62b07efeb186576ab190fe0b766501.tar.bz2
x86: OLPC: Make OLPC=n build again
Stupid me missed the functions called from setup.c. Add the stubs back for OLPC=n Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/include/asm')
-rw-r--r--arch/x86/include/asm/olpc_ofw.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/include/asm/olpc_ofw.h b/arch/x86/include/asm/olpc_ofw.h
index 28a7fec..c5d3a5a 100644
--- a/arch/x86/include/asm/olpc_ofw.h
+++ b/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