summaryrefslogtreecommitdiff
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-02-23 10:32:42 +0100
committerThomas Gleixner <tglx@linutronix.de>2011-02-23 10:40:45 +0100
commitc2a941fadb57d157d59eec424674bd0c3a28788c (patch)
tree5869120dd9774b311580f187d7d4fdfbb3268744 /arch/x86/Kconfig
parentdc3119e700216a70e82fe07a79f1618852058354 (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/Kconfig')
-rw-r--r--arch/x86/Kconfig6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 677501d061a3..4f3d3d432bad 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2069,7 +2069,7 @@ config OLPC
depends on !X86_PAE
select GPIOLIB
select OF
- select OLPC_OPENFIRMWARE_DT if PROC_DEVICETREE
+ select OF_PROMTREE if PROC_DEVICETREE
---help---
Add support for detecting the unique features of the OLPC
XO hardware.
@@ -2080,10 +2080,6 @@ config OLPC_XO1
---help---
Add support for non-essential features of the OLPC XO-1 laptop.
-config OLPC_OPENFIRMWARE_DT
- bool
- select OF_PROMTREE
-
endif # X86_32
config AMD_NB