aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 0ed4c9bfcd13..c25525571347 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2061,6 +2061,7 @@ config SCx200HR_TIMER
2061config OLPC 2061config OLPC
2062 bool "One Laptop Per Child support" 2062 bool "One Laptop Per Child support"
2063 select GPIOLIB 2063 select GPIOLIB
2064 select OLPC_OPENFIRMWARE
2064 ---help--- 2065 ---help---
2065 Add support for detecting the unique features of the OLPC 2066 Add support for detecting the unique features of the OLPC
2066 XO hardware. 2067 XO hardware.
@@ -2068,7 +2069,7 @@ config OLPC
2068config OLPC_OPENFIRMWARE 2069config OLPC_OPENFIRMWARE
2069 bool "Support for OLPC's Open Firmware" 2070 bool "Support for OLPC's Open Firmware"
2070 depends on !X86_64 && !X86_PAE 2071 depends on !X86_64 && !X86_PAE
2071 default y if OLPC 2072 default n
2072 help 2073 help
2073 This option adds support for the implementation of Open Firmware 2074 This option adds support for the implementation of Open Firmware
2074 that is used on the OLPC XO-1 Children's Machine. 2075 that is used on the OLPC XO-1 Children's Machine.