aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-02-23 05:46:01 -0500
committerThomas Gleixner <tglx@linutronix.de>2011-02-23 05:54:02 -0500
commit939d578ecc62b07efeb186576ab190fe0b766501 (patch)
treed7ae552d240e6047e968ee53fc47355457f602e3
parentc2a941fadb57d157d59eec424674bd0c3a28788c (diff)
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>
-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 28a7fec01100..c5d3a5abbb9f 100644
--- a/arch/x86/include/asm/olpc_ofw.h
+++ b/arch/x86/include/asm/olpc_ofw.h
@@ -6,6 +6,8 @@
6 6
7#define OLPC_OFW_SIG 0x2057464F /* aka "OFW " */ 7#define OLPC_OFW_SIG 0x2057464F /* aka "OFW " */
8 8
9#ifdef CONFIG_OLPC
10
9extern bool olpc_ofw_is_installed(void); 11extern bool olpc_ofw_is_installed(void);
10 12
11/* run an OFW command by calling into the firmware */ 13/* run an OFW command by calling into the firmware */
@@ -24,6 +26,11 @@ extern void setup_olpc_ofw_pgd(void);
24/* check if OFW was detected during boot */ 26/* check if OFW was detected during boot */
25extern bool olpc_ofw_present(void); 27extern bool olpc_ofw_present(void);
26 28
29#else /* !CONFIG_OLPC */
30static inline void olpc_ofw_detect(void) { }
31static inline void setup_olpc_ofw_pgd(void) { }
32#endif /* !CONFIG_OLPC */
33
27#ifdef CONFIG_OF_PROMTREE 34#ifdef CONFIG_OF_PROMTREE
28extern void olpc_dt_build_devicetree(void); 35extern void olpc_dt_build_devicetree(void);
29#else 36#else