diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-23 04:32:42 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-23 04:40:45 -0500 |
| commit | c2a941fadb57d157d59eec424674bd0c3a28788c (patch) | |
| tree | 5869120dd9774b311580f187d7d4fdfbb3268744 /arch/x86/include/asm/olpc_ofw.h | |
| parent | dc3119e700216a70e82fe07a79f1618852058354 (diff) | |
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.h | 4 |
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); | |||
| 24 | /* check if OFW was detected during boot */ | 24 | /* check if OFW was detected during boot */ |
| 25 | extern bool olpc_ofw_present(void); | 25 | extern bool olpc_ofw_present(void); |
| 26 | 26 | ||
| 27 | #ifdef CONFIG_OLPC_OPENFIRMWARE_DT | 27 | #ifdef CONFIG_OF_PROMTREE |
| 28 | extern void olpc_dt_build_devicetree(void); | 28 | extern void olpc_dt_build_devicetree(void); |
| 29 | #else | 29 | #else |
| 30 | static inline void olpc_dt_build_devicetree(void) { } | 30 | static inline void olpc_dt_build_devicetree(void) { } |
| 31 | #endif /* CONFIG_OLPC_OPENFIRMWARE_DT */ | 31 | #endif |
| 32 | 32 | ||
| 33 | #endif /* _ASM_X86_OLPC_OFW_H */ | 33 | #endif /* _ASM_X86_OLPC_OFW_H */ |