r1485 - trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/config

[Jens Schmalzing]

Author: jensen
Date: 2004-08-30 10:43:07 -0600 (Mon, 30 Aug 2004)
New Revision: 1485

Modified:
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/config/nosmp.stub
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/config/power3.stub
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/config/powerpc.stub
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/config/smp.stub
Log:
Apparently, the PowerMac floppy driver is not SMP safe.

Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/config/nosmp.stub
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/config/nosmp.stub	2004-08-30 12:49:13 UTC (rev 1484)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/config/nosmp.stub	2004-08-30 16:43:07 UTC (rev 1485)
@@ -1,6 +1,7 @@
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_SMP is not set
+CONFIG_MAC_FLOPPY=y
 CONFIG_MKISS=m
 CONFIG_6PACK=m
 # CONFIG_IRPORT_SIR is not set

Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/config/power3.stub
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/config/power3.stub	2004-08-30 12:49:13 UTC (rev 1484)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/config/power3.stub	2004-08-30 16:43:07 UTC (rev 1485)
@@ -2,7 +2,6 @@
 CONFIG_POWER3=y
 # CONFIG_POWER4 is not set
 CONFIG_PPC64BRIDGE=y
-# CONFIG_MAC_FLOPPY is not set
 CONFIG_ADB_CUDA=y
 CONFIG_ADB_MACIO=y
 CONFIG_THERM_WINDTUNNEL=m

Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/config/powerpc.stub
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/config/powerpc.stub	2004-08-30 12:49:13 UTC (rev 1484)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/config/powerpc.stub	2004-08-30 16:43:07 UTC (rev 1485)
@@ -6,7 +6,6 @@
 # CONFIG_TAU_INT is not set
 # CONFIG_TAU_AVERAGE is not set
 CONFIG_PPC601_SYNC_FIX=y
-CONFIG_MAC_FLOPPY=y
 CONFIG_ADB_CUDA=y
 CONFIG_ADB_MACIO=y
 CONFIG_THERM_WINDTUNNEL=m

Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/config/smp.stub
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/config/smp.stub	2004-08-30 12:49:13 UTC (rev 1484)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/config/smp.stub	2004-08-30 16:43:07 UTC (rev 1485)
@@ -3,3 +3,4 @@
 CONFIG_SMP=y
 # CONFIG_IRQ_ALL_CPUS is not set
 CONFIG_NR_CPUS=32
+# CONFIG_MAC_FLOPPY is not set