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

[Bastian Blank]

Author: waldi
Date: Fri Jun 12 17:28:09 2009
New Revision: 13785

Log:
debian/config/i386/none/config.686, debian/config/kernelarch-x86/config-arch-32:
Move options.

Modified:
   dists/trunk/linux-2.6/debian/config/i386/none/config.686
   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	Fri Jun 12 14:48:26 2009	(r13784)
+++ dists/trunk/linux-2.6/debian/config/i386/none/config.686	Fri Jun 12 17:28:09 2009	(r13785)
@@ -1,10 +1,6 @@
 ##
 ## file: arch/x86/Kconfig
 ##
-## choice: High Memory Support
-# CONFIG_NOHIGHMEM is not set
-CONFIG_HIGHMEM4G=y
-## end choice
 # CONFIG_HIGHPTE is not set
 # CONFIG_MATH_EMULATION is not set
 # CONFIG_EISA 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	Fri Jun 12 14:48:26 2009	(r13784)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Fri Jun 12 17:28:09 2009	(r13785)
@@ -12,6 +12,11 @@
 CONFIG_VM86=y
 CONFIG_TOSHIBA=m
 # CONFIG_X86_REBOOTFIXUPS is not set
+## choice: High Memory Support
+# CONFIG_NOHIGHMEM is not set
+CONFIG_HIGHMEM4G=y
+# CONFIG_HIGHMEM64G is not set
+## end choice
 ## choice: Memory split
 # CONFIG_VMSPLIT_3G is not set
 CONFIG_VMSPLIT_3G_OPT=y