[kernel] r13759 - in dists/trunk/linux-2.6/debian: . config/s390

[Bastian Blank]

Author: waldi
Date: Wed Jun 10 10:43:41 2009
New Revision: 13759

Log:
* debian/changelog: Update.
* debian/config/s390/config: Set SPARSEMEM_MANUAL.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/s390/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Wed Jun 10 10:42:52 2009	(r13758)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Jun 10 10:43:41 2009	(r13759)
@@ -62,6 +62,7 @@
   * [i386] Disable PentiumPro errata workaround.
   * [i386] Enable support for big SMP systems.
   * Disable OSS.
+  * [s390] Use Sparse Memory layout.
 
   [ dann frazier ]
   * Enable bnx2x, using firmware-split patches from net-next and mirroring

Modified: dists/trunk/linux-2.6/debian/config/s390/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/s390/config	Wed Jun 10 10:42:52 2009	(r13758)
+++ dists/trunk/linux-2.6/debian/config/s390/config	Wed Jun 10 10:43:41 2009	(r13759)
@@ -160,9 +160,9 @@
 ## file: mm/Kconfig
 ##
 ## choice: Memory model
-CONFIG_FLATMEM_MANUAL=y
+# CONFIG_FLATMEM_MANUAL is not set
 # CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_SPARSEMEM_MANUAL=y
 ## end choice
 
 ##