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

[Sven Luther]

Author: luther
Date: Thu Nov 24 16:40:50 2005
New Revision: 4889

Modified:
   dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64
Log:
More changes to config.powerpc64.


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 Nov 24 16:40:50 2005
@@ -68,9 +68,6 @@
 CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_SELECT_MEMORY_MODEL=y
-# CONFIG_FLATMEM_MANUAL is not set
-CONFIG_DISCONTIGMEM_MANUAL=y
-# CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_DISCONTIGMEM=y
 CONFIG_IRQ_ALL_CPUS=y
 CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
@@ -79,15 +76,11 @@
 CONFIG_XICS=y
 CONFIG_NODES_SPAN_OTHER_NODES=y
 # CONFIG_MEMORY_HOTPLUG is not set
-# CONFIG_PPC_INDIRECT_PCI is not set
-CONFIG_PM_LEGACY=y
 # CONFIG_PPC_MPC106 is not set
 CONFIG_CPU_FREQ_PMAC64=y
 CONFIG_SPARSEMEM=y
-CONFIG_PPC_I8259=y
 CONFIG_PPC_MERGE=y
 CONFIG_CELL_IIC=y
-CONFIG_WINDFARM=y
 CONFIG_MMIO_NVRAM=y
 CONFIG_PPC_CELL=y
 CONFIG_RTAS_ERROR_LOGGING=y
@@ -95,9 +88,15 @@
 # CONFIG_EMBEDDED6xx is not set
 CONFIG_WINDFARM_PM91=y
 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_WINDFARM_PM81=y
 CONFIG_HAVE_MEMORY_PRESENT=y
 # CONFIG_PPC_64K_PAGES is not set
 CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_I2C_PMAC_SMU=y
+# CONFIG_PPC_INDIRECT_PCI is not set
+# CONFIG_PPC_82xx is not set
+# CONFIG_PPC_52xx is not set
+# CONFIG_PPC_83xx is not set
+CONFIG_POWER3=y
+CONFIG_POWER4=y
+# CONFIG_FLATMEM_MANUAL is not set