1 files changed, 17 insertions, 1 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 1d9d874cba59..f70e3e3a9fa7 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1504,6 +1504,10 @@ config PCI_GODIRECT
 config PCI_GOANY
         bool "Any"
 
+config PCI_GOOLPC
+        bool "OLPC"
+        depends on OLPC
+
 endchoice
 
 config PCI_BIOS
@@ -1513,12 +1517,17 @@ config PCI_BIOS
 # x86-64 doesn't support PCI BIOS access from long mode so always go direct.
 config PCI_DIRECT
         def_bool y
-        depends on PCI && (X86_64 || (PCI_GODIRECT || PCI_GOANY) || X86_VISWS)
+        depends on PCI && (X86_64 || (PCI_GODIRECT || PCI_GOANY || PCI_GOOLPC) || X86_VISWS)
 
 config PCI_MMCONFIG
         def_bool y
         depends on X86_32 && PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY)
 
+config PCI_OLPC
+        bool
+        depends on PCI && PCI_GOOLPC
+        default y
+
 config PCI_DOMAINS
         def_bool y
         depends on PCI
@@ -1638,6 +1647,13 @@ config GEODE_MFGPT_TIMER
           MFGPTs have a better resolution and max interval than the
           generic PIT, and are suitable for use as high-res timers.
 
+config OLPC
+        bool "One Laptop Per Child support"
+        default n
+        help
+          Add support for detecting the unique features of the OLPC
+          XO hardware.
+
 endif # X86_32
 
 config K8_NB