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

[Sven Luther]

Author: luther
Date: Thu Nov 24 17:31:52 2005
New Revision: 4891

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-miboot
Log:
Switched 32bit powerpc to ARCH=powerpc.


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	Thu Nov 24 17:31:52 2005
@@ -1238,7 +1238,6 @@
 # CONFIG_DEBUG_HIGHMEM is not set
 # CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_FS is not set
-# CONFIG_XMON is not set
 # CONFIG_BDI_SWITCH is not set
 CONFIG_BOOTX_TEXT=y
 CONFIG_KEXEC=y
@@ -1263,3 +1262,24 @@
 # CONFIG_SPARSEMEM_MANUAL is not set
 # CONFIG_DISCONTIGMEM_MANUAL is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_PPC_MPC106=y
+CONFIG_PPC_MERGE=y
+CONFIG_MPIC=y
+CONFIG_DEBUGGER=y
+CONFIG_PPC_RTAS=y
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_82xx is not set
+# CONFIG_RTAS_ERROR_LOGGING is not set
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+# CONFIG_XMON_DEFAULT is not set
+# CONFIG_GENERIC_TBSYNC is not set
+# CONFIG_EMBEDDED6xx is not set
+# CONFIG_PPC_ISERIES is not set
+CONFIG_PPC_STD_MMU_32=y
+CONFIG_WATCHDOG_RTAS=m
+# CONFIG_HOTPLUG_PCI is not set
+CONFIG_RTAS_PROC=y
+# CONFIG_PPC_52xx is not set
+# CONFIG_PPC_83xx is not set
+# CONFIG_PPC64 is not set
+CONFIG_XMON=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	Thu Nov 24 17:31:52 2005
@@ -1049,7 +1049,6 @@
 # CONFIG_DEBUG_KOBJECT is not set
 # CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_FS is not set
-# CONFIG_XMON is not set
 # CONFIG_BDI_SWITCH is not set
 
 #

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	Thu Nov 24 17:31:52 2005
@@ -74,3 +74,4 @@
 # CONFIG_SOFTWARE_SUSPEND is not set
 ONFIG_SOFTWARE_SUSPEND=m
 CONFIG_DEFAULT_DEADLINE=y
+CONFIG_DEFAULT_IOSCHED="deadline"