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

[Sven Luther]

Author: luther
Date: Fri Dec 23 23:51:39 2005
New Revision: 5073

Modified:
   dists/trunk/linux-2.6/debian/arch/powerpc/config
   dists/trunk/linux-2.6/debian/arch/powerpc/config.apus
   dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc
   dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot
   dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-smp
   dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64
Log:
Fixed powerpc config options for 2.6.15-rc6. 


Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config	Fri Dec 23 23:51:39 2005
@@ -1255,7 +1255,6 @@
 CONFIG_PM_LEGACY=y
 CONFIG_PPC_I8259=y
 CONFIG_WINDFARM=m
-CONFIG_FLATMEM_MANUAL=y
 CONFIG_FB_NVIDIA_I2C=y
 # CONFIG_SPARSEMEM_MANUAL is not set
 # CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -1281,3 +1280,5 @@
 # CONFIG_PPC_83xx is not set
 # CONFIG_PPC64 is not set
 CONFIG_XMON=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.apus
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.apus	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.apus	Fri Dec 23 23:51:39 2005
@@ -1066,3 +1066,5 @@
 # CONFIG_HWMON_VID is not set
 CONFIG_NFS_ACL_SUPPORT=y
 CONFIG_CRYPTO=y
+CONFIG_FLATMEM_MANUAL=y
+

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc	Fri Dec 23 23:51:39 2005
@@ -5,3 +5,5 @@
 CONFIG_PCMCIA_XIRTULIP=m
 # CONFIG_USB_SERIAL_WHITEHEAT is not set
 CONFIG_MAC_FLOPPY=y
+CONFIG_FLATMEM_MANUAL=y
+

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot	Fri Dec 23 23:51:39 2005
@@ -68,10 +68,11 @@
 # CONFIG_IRPORT_SIR is not set
 # CONFIG_USB_SERIAL_WHITEHEAT is not set
 # CONFIG_PMAC_BACKLIGHT is not set
-
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_CRYPTO_MD5=y
 # CONFIG_SOFTWARE_SUSPEND is not set
 ONFIG_SOFTWARE_SUSPEND=m
 CONFIG_DEFAULT_DEADLINE=y
 CONFIG_DEFAULT_IOSCHED="deadline"
+CONFIG_FLATMEM_MANUAL=y
+

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-smp
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-smp	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-smp	Fri Dec 23 23:51:39 2005
@@ -5,3 +5,5 @@
 CONFIG_IRQ_ALL_CPUS=y
 CONFIG_NR_CPUS=4
 # CONFIG_MAC_FLOPPY is not set
+CONFIG_FLATMEM_MANUAL=y
+

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	Fri Dec 23 23:51:39 2005
@@ -30,8 +30,16 @@
 CONFIG_MEGARAID_LEGACY=m
 CONFIG_MPIC_BROKEN_U3=y
 CONFIG_NR_CPUS=32
-# CONFIG_FLATMEM is not set
-CONFIG_DISCONTIGMEM=y
+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
@@ -103,5 +111,5 @@
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_WINDFARM_PM81=m
 CONFIG_KERNEL_START=0xc000000000000000
-CONFIG_MAC_FLOPPY is not set
+# CONFIG_MAC_FLOPPY is not set