[kernel] r5114 - in dists/trunk/linux-2.6/debian/arch: . arm powerpc

[Jonas Smedegaard]

Author: js
Date: Thu Dec 29 01:09:22 2005
New Revision: 5114

Modified:
   dists/trunk/linux-2.6/debian/arch/arm/config.footbridge
   dists/trunk/linux-2.6/debian/arch/config
   dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64
Log:
Second attempt at first kernel config option cleaning: Single files (and only the duplicate options this time!).

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.footbridge
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.footbridge	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.footbridge	Thu Dec 29 01:09:22 2005
@@ -1244,7 +1244,6 @@
 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

Modified: dists/trunk/linux-2.6/debian/arch/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/config	Thu Dec 29 01:09:22 2005
@@ -105,10 +105,8 @@
 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

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64	Thu Dec 29 01:09:22 2005
@@ -1,4 +1,3 @@
-CONFIG_PPC64=y
 CONFIG_64BIT=y
 CONFIG_COMPAT=y
 CONFIG_CPUSETS=y
@@ -31,16 +30,8 @@
 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