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

[Bastian Blank]

Author: waldi
Date: Fri Jun  5 09:35:33 2009
New Revision: 13728

Log:
* debian/config/i386/none/config.486, debian/config/i386/none/config.686,
  debian/config/i386/none/config.686-bigmem: Remove old option.
* debian/config/kernelarch-x86/config-arch-32: Set X86_GENERIC.

Modified:
   dists/trunk/linux-2.6/debian/config/i386/none/config.486
   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.486
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/none/config.486	Fri Jun  5 08:20:32 2009	(r13727)
+++ dists/trunk/linux-2.6/debian/config/i386/none/config.486	Fri Jun  5 09:35:33 2009	(r13728)
@@ -21,7 +21,6 @@
 CONFIG_M486=y
 # CONFIG_M686 is not set
 ## end choice
-CONFIG_X86_GENERIC=y
 
 ##
 ## file: drivers/char/Kconfig

Modified: dists/trunk/linux-2.6/debian/config/i386/none/config.686
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/none/config.686	Fri Jun  5 08:20:32 2009	(r13727)
+++ dists/trunk/linux-2.6/debian/config/i386/none/config.686	Fri Jun  5 09:35:33 2009	(r13728)
@@ -17,7 +17,6 @@
 # CONFIG_M486 is not set
 CONFIG_M686=y
 ## end choice
-# CONFIG_X86_GENERIC is not set
 
 ##
 ## file: drivers/char/Kconfig

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	Fri Jun  5 08:20:32 2009	(r13727)
+++ dists/trunk/linux-2.6/debian/config/i386/none/config.686-bigmem	Fri Jun  5 09:35:33 2009	(r13728)
@@ -19,7 +19,6 @@
 # CONFIG_M486 is not set
 CONFIG_M686=y
 ## end choice
-# CONFIG_X86_GENERIC is not set
 
 ##
 ## file: drivers/char/Kconfig

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	Fri Jun  5 08:20:32 2009	(r13727)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Fri Jun  5 09:35:33 2009	(r13728)
@@ -40,6 +40,11 @@
 # CONFIG_OLPC is not set
 
 ##
+## file: arch/x86/Kconfig.cpu
+##
+CONFIG_X86_GENERIC=y
+
+##
 ## file: arch/x86/kernel/cpu/cpufreq/Kconfig
 ##
 CONFIG_X86_POWERNOW_K6=m