1 files changed, 38 insertions, 6 deletions

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 8dfa3054f10f..f3eaf22f273d 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -14,6 +14,10 @@ config X86_32
           486, 586, Pentiums, and various instruction-set-compatible chips by
           AMD, Cyrix, and others.
 
+config GENERIC_TIME
+        bool
+        default y
+
 config SEMAPHORE_SLEEPERS
         bool
         default y
@@ -173,6 +177,12 @@ config ACPI_SRAT
         bool
         default y
         depends on NUMA && (X86_SUMMIT || X86_GENERICARCH)
+        select ACPI_NUMA
+
+config HAVE_ARCH_PARSE_SRAT
+       bool
+       default y
+       depends on ACPI_SRAT
 
 config X86_SUMMIT_NUMA
         bool
@@ -224,7 +234,6 @@ config NR_CPUS
 config SCHED_SMT
         bool "SMT (Hyperthreading) scheduler support"
         depends on SMP
-        default off
         help
           SMT scheduler support improves the CPU scheduler's decision making
           when dealing with Intel Pentium 4 chips with HyperThreading at a
@@ -319,6 +328,15 @@ config X86_MCE_P4THERMAL
           Enabling this feature will cause a message to be printed when the P4
           enters thermal throttling.
 
+config VM86
+        default y
+        bool "Enable VM86 support" if EMBEDDED
+        help
+          This option is required by programs like DOSEMU to run 16-bit legacy
+          code on X86 processors. It also may be needed by software like
+          XFree86 to initialize some video cards via BIOS. Disabling this
+          option saves about 6k.
+
 config TOSHIBA
         tristate "Toshiba Laptop support"
         ---help---
@@ -1041,13 +1059,27 @@ config SCx200
         tristate "NatSemi SCx200 support"
         depends on !X86_VOYAGER
         help
-          This provides basic support for the National Semiconductor SCx200
-          processor.  Right now this is just a driver for the GPIO pins.
+          This provides basic support for National Semiconductor's
+          (now AMD's) Geode processors.  The driver probes for the
+          PCI-IDs of several on-chip devices, so its a good dependency
+          for other scx200_* drivers.
 
-          If you don't know what to do here, say N.
+          If compiled as a module, the driver is named scx200.
+
+config SCx200HR_TIMER
+        tristate "NatSemi SCx200 27MHz High-Resolution Timer Support"
+        depends on SCx200 && GENERIC_TIME
+        default y
+        help
+          This driver provides a clocksource built upon the on-chip
+          27MHz high-resolution timer.  Its also a workaround for
+          NSC Geode SC-1100's buggy TSC, which loses time when the
+          processor goes idle (as is done by the scheduler).  The
+          other workaround is idle=poll boot option.
 
-          This support is also available as a module.  If compiled as a
-          module, it will be called scx200.
+config K8_NB
+        def_bool y
+        depends on AGP_AMD64
 
 source "drivers/pcmcia/Kconfig"