summaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-02-23 10:05:53 +0100
committerThomas Gleixner <tglx@linutronix.de>2011-02-23 10:40:45 +0100
commitfe239545a1eed57a60c5d4063f0b56f6cd1811ff (patch)
tree3d500a3b204bdebfefab763932379c24b6feb16e /arch/x86/Kconfig
parent540089798d2ae115fc9bff7ed3823c8c32249607 (diff)
x86: OLPC: Hide OLPC_OPENFIRMWARE config switch
OLPC selects OLPC_OPENFIRMWARE unconditionally. If OLPC=n then the OLPC_OPENFIRMWARE functionality is pointless. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Andres Salomon <dilinger@queued.net>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig10
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index e327f96b880..dbc10fce666 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2080,18 +2080,12 @@ config OLPC_XO1
Add support for non-essential features of the OLPC XO-1 laptop.
config OLPC_OPENFIRMWARE
- bool "Support for OLPC's Open Firmware"
- depends on !X86_PAE
- default n
+ bool
select OF
- help
- This option adds support for the implementation of Open Firmware
- that is used on the OLPC XO-1 Children's Machine.
- If unsure, say N here.
+ select OLPC_OPENFIRMWARE_DT if PROC_DEVICETREE
config OLPC_OPENFIRMWARE_DT
bool
- default y if OLPC_OPENFIRMWARE && PROC_DEVICETREE
select OF_PROMTREE
endif # X86_32