1 files changed, 0 insertions, 119 deletions

diff --git a/arch/x86/Kconfig.i386 b/arch/x86/Kconfig.i386
index 3be76720e896..b8b462a91dc7 100644
--- a/arch/x86/Kconfig.i386
+++ b/arch/x86/Kconfig.i386
@@ -14,83 +14,6 @@ config X86_32
           486, 586, Pentiums, and various instruction-set-compatible chips by
           AMD, Cyrix, and others.
 
-config GENERIC_TIME
-        bool
-        default y
-
-config GENERIC_CMOS_UPDATE
-        bool
-        default y
-
-config CLOCKSOURCE_WATCHDOG
-        bool
-        default y
-
-config GENERIC_CLOCKEVENTS
-        bool
-        default y
-
-config GENERIC_CLOCKEVENTS_BROADCAST
-        bool
-        default y
-        depends on X86_LOCAL_APIC
-
-config LOCKDEP_SUPPORT
-        bool
-        default y
-
-config STACKTRACE_SUPPORT
-        bool
-        default y
-
-config SEMAPHORE_SLEEPERS
-        bool
-        default y
-
-config X86
-        bool
-        default y
-
-config MMU
-        bool
-        default y
-
-config ZONE_DMA
-        bool
-        default y
-
-config QUICKLIST
-        bool
-        default y
-
-config SBUS
-        bool
-
-config GENERIC_ISA_DMA
-        bool
-        default y
-
-config GENERIC_IOMAP
-        bool
-        default y
-
-config GENERIC_BUG
-        bool
-        default y
-        depends on BUG
-
-config GENERIC_HWEIGHT
-        bool
-        default y
-
-config ARCH_MAY_HAVE_PC_FDC
-        bool
-        default y
-
-config DMI
-        bool
-        default y
-
 source "init/Kconfig"
 
 menu "Processor type and features"
@@ -837,9 +760,6 @@ config ARCH_SELECT_MEMORY_MODEL
         def_bool y
         depends on X86_32 && ARCH_SPARSEMEM_ENABLE
 
-config ARCH_POPULATES_NODE_MAP
-        def_bool y
-
 config ARCH_MEMORY_PROBE
         def_bool X86_64
         depends on MEMORY_HOTPLUG
@@ -1148,43 +1068,4 @@ config OUT_OF_LINE_PFN_TO_PAGE
         def_bool X86_64
         depends on DISCONTIGMEM
 
-#
-# Use the generic interrupt handling code in kernel/irq/:
-#
-config GENERIC_HARDIRQS
-        bool
-        default y
-
-config GENERIC_IRQ_PROBE
-        bool
-        default y
-
-config GENERIC_PENDING_IRQ
-        bool
-        depends on GENERIC_HARDIRQS && SMP
-        default y
-
-config X86_SMP
-        bool
-        depends on X86_32 && SMP && !X86_VOYAGER
-        default y
-
-config X86_HT
-        bool
-        depends on SMP && !(X86_VISWS || X86_VOYAGER || MK8)
-        default y
-
-config X86_BIOS_REBOOT
-        bool
-        depends on X86_32 && !(X86_VISWS || X86_VOYAGER)
-        default y
-
-config X86_TRAMPOLINE
-        bool
-        depends on X86_SMP || (X86_VOYAGER && SMP)
-        default y
-
-config KTIME_SCALAR
-        def_bool X86_32
-
 source "arch/x86/Kconfig"