- sorted for 2.6.29, no other change

Changed files:
    kernel-sparc.config -> 1.63
    kernel-x86.config -> 1.5

diff --git a/kernel-sparc.config b/kernel-sparc.config
index 2aadd41ecfa4965946c113b01662cb7adca980af..2fd5ed605f291be7dae5928fadc5f15cf5149985 100644 (file)
--- a/kernel-sparc.config
+++ b/kernel-sparc.config
@@ -8,40 +8,42 @@ OPROFILE_IBS sparc=n
 #-
 #- *** FILE: arch/sparc/Kconfig ***
 #-
+SPARC sparc=y
+SPARC32 sparc=y
 MMU sparc=y
 HIGHMEM sparc=y
 ZONE_DMA sparc=y
 GENERIC_ISA_DMA sparc=y
 #- file init/Kconfig goes here
+#- file kernel/Kconfig.freezer goes here
 SMP sparc=y
 NR_CPUS sparc=32
-SPARC sparc=y
-SPARC32 sparc=y
-SBUS sparc=y
-SBUSCHAR sparc=y
-SERIAL_CONSOLE sparc=y
-SUN_AUXIO sparc=y
-SUN_IO sparc=y
+#- file kernel/Kconfig.hz goes here
 RWSEM_GENERIC_SPINLOCK sparc=y
 GENERIC_FIND_NEXT_BIT sparc=y
 GENERIC_HWEIGHT sparc=y
 GENERIC_CALIBRATE_DELAY sparc=y
 ARCH_MAY_HAVE_PC_FDC sparc=y
-ARCH_HAS_ILOG2_U32 sparc=n
-ARCH_HAS_ILOG2_U64 sparc=n
 EMULATED_CMPXCHG sparc=y
+#- file kernel/time/Kconfig goes here
+#- file drivers/cpufreq/Kconfig goes here
+#- file mm/Kconfig goes here
+#- file kernel/Kconfig.preempt goes here
 SUN_PM sparc=y
-SUN4 sparc=n
+SPARC_LED sparc=m
+SERIAL_CONSOLE sparc=y
+SBUS sparc=y
+SBUSCHAR sparc=y
 #- file drivers/pci/Kconfig goes here
+#- file drivers/pcmcia/Kconfig goes here
 SUN_OPENPROMFS sparc=m
-SPARC_LED sparc=m
 #- file fs/Kconfig.binfmt goes here
-#- file mm/Kconfig goes here
 #- file net/Kconfig goes here
 #- file drivers/Kconfig goes here
 #- file drivers/sbus/char/Kconfig goes here
 #- file fs/Kconfig goes here
 #- file arch/sparc/Kconfig.debug goes here
+#- file kernel/vserver/Kconfig goes here
 #- file security/Kconfig goes here
 #- file crypto/Kconfig goes here
 #- file lib/Kconfig goes here
@@ -52,3 +54,12 @@ SPARC_LED sparc=m
 TRACE_IRQFLAGS_SUPPORT sparc=y
 #- file lib/Kconfig.debug goes here
 DEBUG_STACK_USAGE sparc=n
+
+#-
+#- *** PROBABLY REMOVED OPTIONS ***
+#-
+ARCH_HAS_ILOG2_U32 sparc=n
+ARCH_HAS_ILOG2_U64 sparc=n
+SUN4 sparc=n
+SUN_AUXIO sparc=y
+SUN_IO sparc=y

diff --git a/kernel-x86.config b/kernel-x86.config
index 70d1bc9994e83abecaea9fed8abbee307cc6ef73..69ec851402e6ee31dbc5b2b8f11c78a7c6ab382e 100644 (file)
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -10,15 +10,12 @@ KPROBES x86=y
 #- *** 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_BIGSMP i386=n
 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 @@ MEMTEST x86=n
 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 @@ NOHIGHMEM i386=n
 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_ENABLE_DEFAULT x86=0
 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_DO_ENABLE i386=n
 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 @@ IA32_AOUT x86_64=y
 #- 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 @@ MK8 i386=n x86_64=n amd64=y
 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 @@ GENERIC_CPU x86_64=y amd64=n
 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_PAGEALLOC x86=n
 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_LONGRUN i386=m
 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 @@ KVM_AMD x86=m
 #- *** 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