Merge to Fedora kernel-2.6.18-1.2255_FC5-vs2.0.2.2-rc9 patched with stable patch...

[linux-2.6.git] / arch / i386 / Kconfig

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 51c6580..9c714ef 100644 (file)
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -302,16 +302,6 @@ config X86_LOCAL_APIC
        depends on X86_UP_APIC || ((X86_VISWS || SMP) && !(X86_VOYAGER || XEN_UNPRIVILEGED_GUEST))
        default y
 
-config X86_APIC_AUTO
-        bool "Use heuristics to enable/disable local APIC"
-       depends on X86_LOCAL_APIC
-       help
-         This option uses some proven heuristics to automatically enable or disable the local
-         APIC. All decisions can be overriden by command line options.
-         In a nutshell very old systems run better with APIC off and newer or multiprocessor
-         systems prefer APIC on
-         This is a useful default for distribution kernels.
-
 config X86_IO_APIC
        bool
        depends on X86_UP_IOAPIC || (SMP && !(X86_VISWS || X86_VOYAGER || XEN_UNPRIVILEGED_GUEST))