From 48997227150f2d1d3aa03ae7c3ef0879f44bbc36 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 29 Dec 2005 12:24:53 +0000 Subject: [PATCH] Roll back stage one (duplicates within same file) too. svn path=/dists/trunk/linux-2.6/; revision=5127 --- debian/arch/arm/config.footbridge | 1 + debian/arch/config | 2 ++ debian/arch/powerpc/config.powerpc64 | 9 +++++++++ 3 files changed, 12 insertions(+) diff --git a/debian/arch/arm/config.footbridge b/debian/arch/arm/config.footbridge index 280206999..214569c12 100644 --- a/debian/arch/arm/config.footbridge +++ b/debian/arch/arm/config.footbridge @@ -1244,6 +1244,7 @@ CONFIG_EXT2_FS_SECURITY=y CONFIG_EXT3_FS=y CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_SECURITY=y # CONFIG_JBD is not set CONFIG_REISERFS_FS=m # CONFIG_REISERFS_CHECK is not set diff --git a/debian/arch/config b/debian/arch/config index 28cb1e428..97e416db7 100644 --- a/debian/arch/config +++ b/debian/arch/config @@ -105,8 +105,10 @@ CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=m CONFIG_SECCOMP=y +CONFIG_TCG_TPM=m CONFIG_TCG_ATMEL=m CONFIG_TCG_NSC=m +# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set CONFIG_6PACK=m CONFIG_DVB_USB_DTT200U=m CONFIG_DVB_USB_DIGITV=m diff --git a/debian/arch/powerpc/config.powerpc64 b/debian/arch/powerpc/config.powerpc64 index 87682deff..7a64ad2dd 100644 --- a/debian/arch/powerpc/config.powerpc64 +++ b/debian/arch/powerpc/config.powerpc64 @@ -1,3 +1,4 @@ +CONFIG_PPC64=y CONFIG_64BIT=y CONFIG_COMPAT=y CONFIG_CPUSETS=y @@ -30,8 +31,16 @@ CONFIG_LPARCFG=m CONFIG_MEGARAID_LEGACY=m CONFIG_MPIC_BROKEN_U3=y CONFIG_NR_CPUS=32 +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_SELECT_MEMORY_MODEL=y +# CONFIG_FLATMEM_MANUAL is not set # CONFIG_DISCONTIGMEM_MANUAL is not set +CONFIG_SPARSEMEM_MANUAL=y +CONFIG_SPARSEMEM=y +CONFIG_HAVE_MEMORY_PRESENT=y # CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPARSEMEM_EXTREME=y +# CONFIG_MEMORY_HOTPLUG is not set CONFIG_NUMA=y # CONFIG_PMAC_BACKLIGHT is not set # CONFIG_PMAC_PBOOK is not set