1 files changed, 34 insertions, 6 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index a12dbb2b93f3..845ea2b2d487 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -25,6 +25,18 @@ config X86
         select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)
         select HAVE_ARCH_KGDB if !X86_VOYAGER
 
+config DEFCONFIG_LIST
+        string
+        depends on X86_32
+        option defconfig_list
+        default "arch/x86/configs/i386_defconfig"
+
+config DEFCONFIG_LIST
+        string
+        depends on X86_64
+        option defconfig_list
+        default "arch/x86/configs/x86_64_defconfig"
+
 
 config GENERIC_LOCKBREAK
         def_bool n
@@ -180,7 +192,7 @@ config X86_HT
 
 config X86_BIOS_REBOOT
         bool
-        depends on X86_32 && !(X86_VISWS || X86_VOYAGER)
+        depends on !X86_VISWS && !X86_VOYAGER
         default y
 
 config X86_TRAMPOLINE
@@ -537,9 +549,6 @@ config CALGARY_IOMMU_ENABLED_BY_DEFAULT
           Calgary anyway, pass 'iommu=calgary' on the kernel command line.
           If unsure, say Y.
 
-config IOMMU_HELPER
-        def_bool (CALGARY_IOMMU || GART_IOMMU)
-
 # need this always selected by IOMMU for the VIA workaround
 config SWIOTLB
         bool
@@ -550,6 +559,8 @@ config SWIOTLB
           access 32-bits of memory can be used on systems with more than
           3 GB of memory. If unsure, say Y.
 
+config IOMMU_HELPER
+        def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB)
 
 config NR_CPUS
         int "Maximum number of CPUs (2-255)"
@@ -1162,7 +1173,7 @@ source kernel/Kconfig.hz
 
 config KEXEC
         bool "kexec system call"
-        depends on X86_64 || X86_BIOS_REBOOT
+        depends on X86_BIOS_REBOOT
         help
           kexec is a system call that implements the ability to shutdown your
           current kernel, and to start another kernel.  It is like a reboot
@@ -1505,6 +1516,10 @@ config PCI_GODIRECT
 config PCI_GOANY
         bool "Any"
 
+config PCI_GOOLPC
+        bool "OLPC"
+        depends on OLPC
+
 endchoice
 
 config PCI_BIOS
@@ -1514,12 +1529,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
@@ -1639,6 +1659,14 @@ 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"
+        depends on MGEODE_LX
+        default n
+        help
+          Add support for detecting the unique features of the OLPC
+          XO hardware.
+
 endif # X86_32
 
 config K8_NB