[kernel] r13653 - in dists/trunk/linux-2.6/debian/config: i386/none kernelarch-x86

[Bastian Blank]

Author: waldi
Date: Wed May 20 15:39:29 2009
New Revision: 13653

Log:
* debian/config/i386/none/config.686,
  debian/config/i386/none/config.686-bigmem: Remove options.
* debian/config/kernelarch-x86/config-arch-32: Add options.

Modified:
   dists/trunk/linux-2.6/debian/config/i386/none/config.686
   dists/trunk/linux-2.6/debian/config/i386/none/config.686-bigmem
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32

Modified: dists/trunk/linux-2.6/debian/config/i386/none/config.686
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/none/config.686	Wed May 20 15:20:17 2009	(r13652)
+++ dists/trunk/linux-2.6/debian/config/i386/none/config.686	Wed May 20 15:39:29 2009	(r13653)
@@ -1,11 +1,6 @@
 ##
 ## file: arch/x86/Kconfig
 ##
-CONFIG_SMP=y
-CONFIG_NR_CPUS=8
-CONFIG_X86_MCE=y
-CONFIG_X86_MCE_NONFATAL=m
-CONFIG_X86_MCE_P4THERMAL=y
 ## choice: High Memory Support
 # CONFIG_NOHIGHMEM is not set
 CONFIG_HIGHMEM4G=y

Modified: dists/trunk/linux-2.6/debian/config/i386/none/config.686-bigmem
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/none/config.686-bigmem	Wed May 20 15:20:17 2009	(r13652)
+++ dists/trunk/linux-2.6/debian/config/i386/none/config.686-bigmem	Wed May 20 15:39:29 2009	(r13653)
@@ -1,19 +1,6 @@
 ##
 ## file: arch/x86/Kconfig
 ##
-CONFIG_SMP=y
-# CONFIG_X86_BIGSMP is not set
-# CONFIG_X86_VSMP is not set
-# CONFIG_X86_ELAN is not set
-# CONFIG_X86_RDC321X is not set
-# CONFIG_X86_NUMAQ is not set
-# CONFIG_X86_VISWS is not set
-# CONFIG_X86_SUMMIT is not set
-# CONFIG_X86_ES7000 is not set
-CONFIG_NR_CPUS=32
-CONFIG_X86_MCE=y
-CONFIG_X86_MCE_NONFATAL=m
-CONFIG_X86_MCE_P4THERMAL=y
 ## choice: High Memory Support
 # CONFIG_NOHIGHMEM is not set
 # CONFIG_HIGHMEM4G is not set

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Wed May 20 15:20:17 2009	(r13652)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Wed May 20 15:39:29 2009	(r13653)
@@ -2,15 +2,13 @@
 ## file: arch/x86/Kconfig
 ##
 # CONFIG_64BIT is not set
+CONFIG_SMP=y
 # CONFIG_SPARSE_IRQ is not set
 # CONFIG_X86_BIGSMP is not set
-# CONFIG_X86_ELAN is not set
-# CONFIG_X86_RDC321X is not set
-# CONFIG_X86_NUMAQ is not set
-# CONFIG_X86_VISWS is not set
-# CONFIG_X86_SUMMIT is not set
-# CONFIG_X86_ES7000 is not set
 CONFIG_VMI=y
+CONFIG_NR_CPUS=32
+CONFIG_X86_MCE_NONFATAL=m
+CONFIG_X86_MCE_P4THERMAL=y
 CONFIG_VM86=y
 CONFIG_TOSHIBA=m
 # CONFIG_X86_REBOOTFIXUPS is not set