SOURCES: kernel-x86.config - sorted for 2.6.29, no other change

[sparky]

Author: sparky                       Date: Tue Mar 31 19:53:33 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- sorted for 2.6.29, no other change

---- Files affected:
SOURCES:
   kernel-x86.config (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/kernel-x86.config
diff -u SOURCES/kernel-x86.config:1.4 SOURCES/kernel-x86.config:1.5
--- SOURCES/kernel-x86.config:1.4	Tue Mar 31 14:02:38 2009
+++ SOURCES/kernel-x86.config	Tue Mar 31 21:53:28 2009
@@ -10,15 +10,12 @@
 #- *** FILE: arch/x86/Kconfig ***
 #-
 64BIT i386=n x86_64=y
-SPARSE_IRQ i386=y x86_64=y
-NUMA_MIGRATE_IRQ_DESC i386=y x86_64=y
-SCHED_OMIT_FRAME_POINTER i386=y x86_64=y
-MAXSMP i386=n x86_64=n
-X86_REROUTE_FOR_BROKEN_BOOT_IRQS i386=y x86_64=y
-X86_PLATFORM_DEVICES i386=y x86_64=y
 #- file init/Kconfig goes here
+#- file kernel/Kconfig.freezer goes here
 #- file kernel/time/Kconfig goes here
 SMP x86=y
+SPARSE_IRQ i386=y x86_64=y
+NUMA_MIGRATE_IRQ_DESC i386=y x86_64=y
 X86_MPPARSE i386=y x86_64=n
 X86_PC x86=y
 X86_ELAN i386=n
@@ -31,7 +28,7 @@
 X86_VSMP x86_64=n
 X86_VISWS i386=n
 X86_RDC321X i386=n
-SCHED_NO_NO_OMIT_FRAME_POINTER i386=y
+SCHED_OMIT_FRAME_POINTER i386=y x86_64=y
 PARAVIRT_GUEST x86=n
 #- file arch/x86/xen/Kconfig goes here
 VMI i386=y
@@ -42,15 +39,16 @@
 HPET_TIMER x86=y
 CALGARY_IOMMU x86_64=y
 CALGARY_IOMMU_ENABLED_BY_DEFAULT x86_64=y
-X86_PTRACE_BTS i386=y x86_64=y
 AMD_IOMMU x86_64=y
 AMD_IOMMU_STATS x86_64=n
+MAXSMP i386=n x86_64=n
 NR_CPUS x86=32
 SCHED_SMT x86=y
 SCHED_MC x86=y
 #- file kernel/Kconfig.preempt goes here
 X86_UP_APIC i386=y
 X86_UP_IOAPIC i386=y
+X86_REROUTE_FOR_BROKEN_BOOT_IRQS i386=y x86_64=y
 X86_MCE x86=y
 X86_MCE_INTEL x86_64=y
 X86_MCE_AMD x86_64=y
@@ -69,6 +67,7 @@
 HIGHMEM4G i386=y
 HIGHMEM64G i386=n
 PAGE_OFFSET i386=0xC0000000
+DIRECT_GBPAGES x86=n
 NUMA x86_64=y
 #- NUMA (Summit) requires SMP, 64GB highmem support, ACPI
 K8_NUMA x86_64=n
@@ -86,7 +85,6 @@
 MTRR_SANITIZER_SPARE_REG_NR_DEFAULT x86=1
 X86_PAT x86=y
 EFI x86=y
-IRQBALANCE i386=n
 SECCOMP x86=y
 #- file kernel/Kconfig.hz goes here
 KEXEC x86=y
@@ -104,9 +102,9 @@
 APM_CPU_IDLE i386=y
 APM_DISPLAY_BLANK i386=n
 APM_ALLOW_INTS i386=n
-APM_REAL_MODE_POWER_OFF i386=y
 #- file arch/x86/kernel/cpu/cpufreq/Kconfig goes here
 #- file drivers/cpuidle/Kconfig goes here
+#- file drivers/idle/Kconfig goes here
 PCI_GOBIOS i386=n
 PCI_GOMMCONFIG i386=n
 PCI_GODIRECT i386=n
@@ -134,6 +132,7 @@
 #- file drivers/firmware/Kconfig goes here
 #- file fs/Kconfig goes here
 #- file arch/x86/Kconfig.debug goes here
+#- file kernel/vserver/Kconfig goes here
 #- file security/Kconfig goes here
 #- file crypto/Kconfig goes here
 #- file arch/x86/kvm/Kconfig goes here
@@ -158,7 +157,6 @@
 MCRUSOE i386=n
 MEFFICEON i386=n
 MWINCHIPC6 i386=n
-MWINCHIP2 i386=n
 MWINCHIP3D i386=n
 MGEODEGX1 i386=n
 MGEODE_LX i386=n
@@ -171,6 +169,7 @@
 X86_GENERIC i386=y i586=n i686=n pentium3=n pentium4=n athlon=n
 #* do we care ?
 X86_PPRO_FENCE i386=y pentium3= pentium4= athlon=
+X86_PTRACE_BTS i386=y x86_64=y
 
 #-
 #- *** FILE: arch/x86/Kconfig.debug ***
@@ -185,11 +184,9 @@
 DEBUG_PER_CPU_MAPS x86=n
 X86_PTDUMP x86=n
 DEBUG_RODATA x86=n
-DIRECT_GBPAGES x86=n
 DEBUG_NX_TEST x86=m
 4KSTACKS i386=n
 IOMMU_DEBUG x86_64=n
-MMIOTRACE x86=n
 IO_DELAY_0X80 x86=y
 IO_DELAY_0XED x86=n
 IO_DELAY_UDELAY x86=n
@@ -218,7 +215,6 @@
 X86_LONGHAUL i386=m
 X86_E_POWERSAVER i386=m
 #- shared options
-X86_ACPI_CPUFREQ_PROC_INTF i386=y x86_64=n
 X86_SPEEDSTEP_RELAXED_CAP_CHECK i386=y
 
 #-
@@ -235,3 +231,22 @@
 #- *** FILE: arch/x86/xen/Kconfig ***
 #-
 XEN i386=n
+
+#-
+#- *** FILE: drivers/platform/x86/Kconfig ***
+#-
+X86_PLATFORM_DEVICES i386=y x86_64=y
+
+#-
+#- *** FILE: kernel/trace/Kconfig ***
+#-
+MMIOTRACE x86=n
+
+#-
+#- *** PROBABLY REMOVED OPTIONS ***
+#-
+APM_REAL_MODE_POWER_OFF i386=y
+IRQBALANCE i386=n
+MWINCHIP2 i386=n
+SCHED_NO_NO_OMIT_FRAME_POINTER i386=y
+X86_ACPI_CPUFREQ_PROC_INTF i386=y x86_64=n
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-x86.config?r1=1.4&r2=1.5&f=u