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

[Bastian Blank]

Author: waldi
Date: Wed Jun 10 11:15:08 2009
New Revision: 13764

Log:
debian/config/amd64/config, debian/config/i386/config,
debian/config/kernelarch-x86: Move options.

Modified:
   dists/trunk/linux-2.6/debian/config/amd64/config
   dists/trunk/linux-2.6/debian/config/i386/config
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64

Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config	Wed Jun 10 11:09:58 2009	(r13763)
+++ dists/trunk/linux-2.6/debian/config/amd64/config	Wed Jun 10 11:15:08 2009	(r13764)
@@ -1245,11 +1245,6 @@
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 
 ##
-## file: mm/Kconfig
-##
-CONFIG_SPARSEMEM_VMEMMAP=y
-
-##
 ## file: mm/Kconfig.debug
 ##
 # CONFIG_DEBUG_PAGEALLOC is not set

Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config	Wed Jun 10 11:09:58 2009	(r13763)
+++ dists/trunk/linux-2.6/debian/config/i386/config	Wed Jun 10 11:15:08 2009	(r13764)
@@ -1423,15 +1423,6 @@
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 
 ##
-## file: mm/Kconfig
-##
-## choice: Memory model
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-## end choice
-
-##
 ## file: mm/Kconfig.debug
 ##
 # CONFIG_DEBUG_PAGEALLOC 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 Jun 10 11:09:58 2009	(r13763)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Wed Jun 10 11:15:08 2009	(r13764)
@@ -84,3 +84,12 @@
 ##
 CONFIG_FRAME_WARN=1024
 
+##
+## file: mm/Kconfig
+##
+## choice: Memory model
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+## end choice
+

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Wed Jun 10 11:09:58 2009	(r13763)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Wed Jun 10 11:15:08 2009	(r13764)
@@ -53,5 +53,6 @@
 ## choice: Memory model
 CONFIG_SPARSEMEM_MANUAL=y
 ## end choice
+CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_MIGRATION=y