aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/olpc_ofw.h
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/include/asm/olpc_ofw.h')
-rw-r--r--arch/x86/include/asm/olpc_ofw.h14
1 files changed, 10 insertions, 4 deletions
diff --git a/arch/x86/include/asm/olpc_ofw.h b/arch/x86/include/asm/olpc_ofw.h
index 08fde475cb3..24487712e0b 100644
--- a/arch/x86/include/asm/olpc_ofw.h
+++ b/arch/x86/include/asm/olpc_ofw.h
@@ -6,7 +6,9 @@
#define OLPC_OFW_SIG 0x2057464F /* aka "OFW " */
-#ifdef CONFIG_OLPC_OPENFIRMWARE
+#ifdef CONFIG_OLPC
+
+extern bool olpc_ofw_is_installed(void);
/* run an OFW command by calling into the firmware */
#define olpc_ofw(name, args, res) \
@@ -21,11 +23,15 @@ extern void olpc_ofw_detect(void);
/* install OFW's pde permanently into the kernel's pgtable */
extern void setup_olpc_ofw_pgd(void);
-#else /* !CONFIG_OLPC_OPENFIRMWARE */
+/* check if OFW was detected during boot */
+extern bool olpc_ofw_present(void);
+
+extern void olpc_dt_build_devicetree(void);
+#else /* !CONFIG_OLPC */
static inline void olpc_ofw_detect(void) { }
static inline void setup_olpc_ofw_pgd(void) { }
-
-#endif /* !CONFIG_OLPC_OPENFIRMWARE */
+static inline void olpc_dt_build_devicetree(void) { }
+#endif /* !CONFIG_OLPC */
#endif /* _ASM_X86_OLPC_OFW_H */