x86: OLPC: Cleanup config maze completely

[linux-2.6-microblaze.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index d5ed94d..677501d 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2066,9 +2066,10 @@ config SCx200HR_TIMER
 
 config OLPC
        bool "One Laptop Per Child support"
+       depends on !X86_PAE
        select GPIOLIB
-       select OLPC_OPENFIRMWARE
-       depends on !X86_64 && !X86_PAE
+       select OF
+       select OLPC_OPENFIRMWARE_DT if PROC_DEVICETREE
        ---help---
          Add support for detecting the unique features of the OLPC
          XO hardware.
@@ -2079,19 +2080,8 @@ config OLPC_XO1
        ---help---
          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_64 && !X86_PAE
-       default n
-       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.
-
 config OLPC_OPENFIRMWARE_DT
        bool
-       default y if OLPC_OPENFIRMWARE && PROC_DEVICETREE
        select OF_PROMTREE
 
 endif # X86_32