summaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorDaniel Drake2010-09-23 18:28:04 +0200
committerH. Peter Anvin2010-09-23 20:14:18 +0200
commit76fb657017588a0912f0d1d140cb807446e4ef05 (patch)
tree7bd59420c34c78a7581e8bdbfb870fdb3e47eb50 /arch/x86/Kconfig
parentLinux 2.6.36-rc5 (diff)
downloadkernel-qcow2-linux-76fb657017588a0912f0d1d140cb807446e4ef05.tar.gz
kernel-qcow2-linux-76fb657017588a0912f0d1d140cb807446e4ef05.tar.xz
kernel-qcow2-linux-76fb657017588a0912f0d1d140cb807446e4ef05.zip
x86, olpc: Only enable PCI configuration type override on XO-1
This configuration type override is for XO-1 only and must not happen on XO-1.5. Signed-off-by: Daniel Drake <dsd@laptop.org> LKML-Reference: <20100923162805.0F6549D401B@zog.reactivated.net> Cc: Andres Solomon <dilinger@queued.net> Cc: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index cea0cd9a316f..0ed4c9bfcd13 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1900,7 +1900,7 @@ config PCI_GODIRECT
bool "Direct"
config PCI_GOOLPC
- bool "OLPC"
+ bool "OLPC XO-1"
depends on OLPC
config PCI_GOANY