From ba4421336ccdc6f58c5ffdcd155ae77f8710e3a0 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Wed, 10 Jun 2009 10:43:41 +0000 Subject: [PATCH] * debian/changelog: Update. * debian/config/s390/config: Set SPARSEMEM_MANUAL. svn path=/dists/trunk/linux-2.6/; revision=13759 --- debian/changelog | 1 + debian/config/s390/config | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 223f4df03..03a8d2bb6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -62,6 +62,7 @@ linux-2.6 (2.6.30-1~experimental.1) UNRELEASED; urgency=low * [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 diff --git a/debian/config/s390/config b/debian/config/s390/config index 009d94023..4f1ccce69 100644 --- a/debian/config/s390/config +++ b/debian/config/s390/config @@ -160,9 +160,9 @@ CONFIG_BSD_DISKLABEL=y ## 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 ##