diff options
Diffstat (limited to 'arch/x86/include/asm/olpc_ofw.h')
-rw-r--r-- | arch/x86/include/asm/olpc_ofw.h | 14 |
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 08fde475cb3b..24487712e0b1 100644 --- a/arch/x86/include/asm/olpc_ofw.h +++ b/arch/x86/include/asm/olpc_ofw.h | |||
@@ -6,7 +6,9 @@ | |||
6 | 6 | ||
7 | #define OLPC_OFW_SIG 0x2057464F /* aka "OFW " */ | 7 | #define OLPC_OFW_SIG 0x2057464F /* aka "OFW " */ |
8 | 8 | ||
9 | #ifdef CONFIG_OLPC_OPENFIRMWARE | 9 | #ifdef CONFIG_OLPC |
10 | |||
11 | extern 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 */ |
12 | #define olpc_ofw(name, args, res) \ | 14 | #define olpc_ofw(name, args, res) \ |
@@ -21,11 +23,15 @@ extern void olpc_ofw_detect(void); | |||
21 | /* install OFW's pde permanently into the kernel's pgtable */ | 23 | /* install OFW's pde permanently into the kernel's pgtable */ |
22 | extern void setup_olpc_ofw_pgd(void); | 24 | extern void setup_olpc_ofw_pgd(void); |
23 | 25 | ||
24 | #else /* !CONFIG_OLPC_OPENFIRMWARE */ | 26 | /* check if OFW was detected during boot */ |
27 | extern bool olpc_ofw_present(void); | ||
28 | |||
29 | extern void olpc_dt_build_devicetree(void); | ||
25 | 30 | ||
31 | #else /* !CONFIG_OLPC */ | ||
26 | static inline void olpc_ofw_detect(void) { } | 32 | static inline void olpc_ofw_detect(void) { } |
27 | static inline void setup_olpc_ofw_pgd(void) { } | 33 | static inline void setup_olpc_ofw_pgd(void) { } |
28 | 34 | static inline void olpc_dt_build_devicetree(void) { } | |
29 | #endif /* !CONFIG_OLPC_OPENFIRMWARE */ | 35 | #endif /* !CONFIG_OLPC */ |
30 | 36 | ||
31 | #endif /* _ASM_X86_OLPC_OFW_H */ | 37 | #endif /* _ASM_X86_OLPC_OFW_H */ |