[kernel] r5129 - dists/trunk/linux-2.6/debian/arch/powerpc

[Jonas Smedegaard]

Author: js
Date: Thu Dec 29 12:41:56 2005
New Revision: 5129

Modified:
   dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64
Log:
Third attempt at phase one (duplicates within same files) kernel config option cleaning: Now only strip duplicate options above a _defined_ entry (undefined duplicates still confuse split-config but needs more careful handling).

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 12:41:56 2005
@@ -1,4 +1,3 @@
-CONFIG_PPC64=y
 CONFIG_64BIT=y
 CONFIG_COMPAT=y
 CONFIG_CPUSETS=y
@@ -31,15 +30,9 @@
 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