git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
olpc_ofw.h
diff --git
a/arch/x86/include/asm/olpc_ofw.h
b/arch/x86/include/asm/olpc_ofw.h
index
c5d3a5a
..
2448771
100644
(file)
--- a/
arch/x86/include/asm/olpc_ofw.h
+++ b/
arch/x86/include/asm/olpc_ofw.h
@@
-26,15
+26,12
@@
extern void setup_olpc_ofw_pgd(void);
/* check if OFW was detected during boot */
extern bool olpc_ofw_present(void);
/* 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) { }
#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
static inline void olpc_dt_build_devicetree(void) { }
static inline void olpc_dt_build_devicetree(void) { }
-#endif
+#endif
/* !CONFIG_OLPC */
#endif /* _ASM_X86_OLPC_OFW_H */
#endif /* _ASM_X86_OLPC_OFW_H */