aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-21 13:52:01 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-21 13:52:01 -0700
commitcca8209ed962f87990345ba073979d2b55dd1187 (patch)
tree7629ee8d3396396570bdc35cc4220322c18c71cc /arch/x86/Kconfig
parentd77bdc423d6d6efcd18d329bbf8eb9351953dd30 (diff)
parent9e9006e9090dc1f88d5127cb69f416013e7ecd60 (diff)
downloadmrst-s0i3-test-cca8209ed962f87990345ba073979d2b55dd1187.tar.gz
mrst-s0i3-test-cca8209ed962f87990345ba073979d2b55dd1187.tar.xz
mrst-s0i3-test-cca8209ed962f87990345ba073979d2b55dd1187.zip
Merge branch 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, olpc: XO-1 uses/depends on PCI x86, olpc: Register XO-1 platform devices x86, olpc: Add XO-1 poweroff support x86, olpc: Don't retry EC commands forever x86, olpc: Rework BIOS signature check x86, olpc: Only enable PCI configuration type override on XO-1
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig11
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 8e9c4d4772f..8a86a1e6825 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1927,7 +1927,7 @@ config PCI_GODIRECT
bool "Direct"
config PCI_GOOLPC
- bool "OLPC"
+ bool "OLPC XO-1"
depends on OLPC
config PCI_GOANY
@@ -2088,14 +2088,21 @@ config SCx200HR_TIMER
config OLPC
bool "One Laptop Per Child support"
select GPIOLIB
+ select OLPC_OPENFIRMWARE
---help---
Add support for detecting the unique features of the OLPC
XO hardware.
+config OLPC_XO1
+ tristate "OLPC XO-1 support"
+ depends on OLPC && PCI
+ ---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 y if OLPC
+ default n
help
This option adds support for the implementation of Open Firmware
that is used on the OLPC XO-1 Children's Machine.