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

[Bastian Blank]

Author: waldi
Date: Tue Jun 20 12:44:05 2006
New Revision: 6837

Modified:
   dists/trunk/linux-2.6/debian/arch/powerpc/vserver/config.powerpc
   dists/trunk/linux-2.6/debian/arch/powerpc/vserver/config.powerpc64

Log:
debian/arch/powerpc/vserver/config.powerpc,
debian/arch/powerpc/vserver/config.powerpc64: Update.


Modified: dists/trunk/linux-2.6/debian/arch/powerpc/vserver/config.powerpc
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/vserver/config.powerpc	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/vserver/config.powerpc	Tue Jun 20 12:44:05 2006
@@ -1,12 +1,11 @@
 # CONFIG_APUS is not set
 CONFIG_PPC32=y
-CONFIG_LOCK_KERNEL=y
-# CONFIG_CPUSETS is not set
-CONFIG_STOP_MACHINE=y
-CONFIG_SMP=y
-CONFIG_IRQ_ALL_CPUS=y
-CONFIG_NR_CPUS=4
-# CONFIG_MAC_FLOPPY is not set
+# CONFIG_SMP is not set
+CONFIG_PM_STD_PARTITION=""
+# CONFIG_IRPORT_SIR is not set
+CONFIG_PCMCIA_XIRTULIP=m
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
+CONFIG_MAC_FLOPPY=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FB_CONTROL=y
 CONFIG_FB_PLATINUM=y

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/vserver/config.powerpc64
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/vserver/config.powerpc64	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/vserver/config.powerpc64	Tue Jun 20 12:44:05 2006
@@ -108,3 +108,5 @@
 CONFIG_SPU_FS=m
 CONFIG_SPIDER_NET=m
 # CONFIG_LPARCFG is not set
+CONFIG_VIRT_CPU_ACCOUNTING=y
+CONFIG_MIGRATION=y