summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/olpc_ofw.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-02-23 12:32:42 +0300
committerThomas Gleixner <tglx@linutronix.de>2011-02-23 12:40:45 +0300
commitc2a941fadb57d157d59eec424674bd0c3a28788c (patch)
tree5869120dd9774b311580f187d7d4fdfbb3268744 /arch/x86/include/asm/olpc_ofw.h
parentdc3119e700216a70e82fe07a79f1618852058354 (diff)
downloadlinux-c2a941fadb57d157d59eec424674bd0c3a28788c.tar.xz
x86: OLPC: Remove extra OLPC_OPENFIRMWARE_DT indirection
OLPC_OPENFIRMWARE_DT is just there to be selected by OLPC and selects OF_PROMTREE. So let OLPC select OF_PROMTREE and remove that extra config indirection. Fixup code and Makefile and use CONFIG_OF_PROMTREE instead. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Andres Salomon <dilinger@queued.net>
Diffstat (limited to 'arch/x86/include/asm/olpc_ofw.h')
-rw-r--r--arch/x86/include/asm/olpc_ofw.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/olpc_ofw.h b/arch/x86/include/asm/olpc_ofw.h
index 1fff2de124e5..28a7fec01100 100644
--- a/arch/x86/include/asm/olpc_ofw.h
+++ b/arch/x86/include/asm/olpc_ofw.h
@@ -24,10 +24,10 @@ extern void setup_olpc_ofw_pgd(void);
/* check if OFW was detected during boot */
extern bool olpc_ofw_present(void);
-#ifdef CONFIG_OLPC_OPENFIRMWARE_DT
+#ifdef CONFIG_OF_PROMTREE
extern void olpc_dt_build_devicetree(void);
#else
static inline void olpc_dt_build_devicetree(void) { }
-#endif /* CONFIG_OLPC_OPENFIRMWARE_DT */
+#endif
#endif /* _ASM_X86_OLPC_OFW_H */