- sorted for 2.6.32, no other change introduced

Changed files:
    kernel-x86.config -> 1.16

diff --git a/kernel-x86.config b/kernel-x86.config
index 1ea57e2128f6bcff14a1558bba28c435114737d1..40f376d705063e2c2f3af34989cb6cb2c762965e 100644 (file)
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -53,9 +53,6 @@ X86_MCE x86=y
 X86_MCE_INTEL x86_64=y i686=y
 X86_MCE_AMD x86_64=y i686=y
 X86_ANCIENT_MCE i686=y
-X86_MCE_NONFATAL i386=m
-X86_MCE_P4THERMAL i386=y
-X86_OLD_MCE i386=n
 VM86 i386=y
 TOSHIBA i386=m
 I8K x86=m
@@ -102,6 +99,7 @@ COMPAT_VDSO x86=n
 CMDLINE_BOOL x86=n
 #- file kernel/power/Kconfig goes here
 #- file drivers/acpi/Kconfig goes here
+#- file drivers/sfi/Kconfig goes here
 APM i386=m
 APM_IGNORE_USER_SUSPEND i386=n
 APM_DO_ENABLE i386=n
@@ -224,11 +222,11 @@ X86_SPEEDSTEP_RELAXED_CAP_CHECK i386=y
 #-
 #- *** FILE: arch/x86/kvm/Kconfig ***
 #-
+#- file virt/kvm/Kconfig goes here
 VIRTUALIZATION x86=y
 KVM x86=m
 KVM_INTEL x86=m
 KVM_AMD x86=m
-KVM_TRACE all=n
 #- file drivers/lguest/Kconfig goes here
 #- file drivers/virtio/Kconfig goes here
 
@@ -257,11 +255,15 @@ DEBUG_PAGEALLOC x86=n
 #-
 APM_REAL_MODE_POWER_OFF i386=y
 IRQBALANCE i386=n
+KVM_TRACE all=n
 MWINCHIP2 i386=n
 NUMA_MIGRATE_IRQ_DESC i386=y x86_64=y
 SCHED_NO_NO_OMIT_FRAME_POINTER i386=y
 X86_ACPI_CPUFREQ_PROC_INTF i386=y x86_64=n
 X86_GENERICARCH i386=n
+X86_MCE_NONFATAL i386=m
+X86_MCE_P4THERMAL i386=y
+X86_OLD_MCE i386=n
 X86_PC x86=y
 X86_POWERNOW_K8_ACPI x86=y
 X86_VOYAGER i386=n