r3555 - trunk/kernel/source/linux-2.6-2.6.12/debian/arch/powerpc

[Sven Luther]

Author: luther
Date: 2005-07-16 12:49:55 +0000 (Sat, 16 Jul 2005)
New Revision: 3555

Modified:
   trunk/kernel/source/linux-2.6-2.6.12/debian/arch/powerpc/config
   trunk/kernel/source/linux-2.6-2.6.12/debian/arch/powerpc/config.powerpc
   trunk/kernel/source/linux-2.6-2.6.12/debian/arch/powerpc/config.powerpc-smp
Log:
Oh well, i guess we moved to modular stuff while i was trying to build :)
now build MAC_FLOPPY only on non-smp, as it FTBFS on smp.


Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/arch/powerpc/config
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/arch/powerpc/config	2005-07-16 12:27:00 UTC (rev 3554)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/arch/powerpc/config	2005-07-16 12:49:55 UTC (rev 3555)
@@ -119,7 +119,6 @@
 # CONFIG_MTD is not set
 # CONFIG_PARPORT is not set
 CONFIG_BLK_DEV_FD=m
-CONFIG_MAC_FLOPPY=y
 CONFIG_BLK_CPQ_DA=m
 CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_CISS_SCSI_TAPE=y

Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/arch/powerpc/config.powerpc
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/arch/powerpc/config.powerpc	2005-07-16 12:27:00 UTC (rev 3554)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/arch/powerpc/config.powerpc	2005-07-16 12:49:55 UTC (rev 3555)
@@ -7,3 +7,4 @@
 # CONFIG_IRPORT_SIR is not set
 CONFIG_PCMCIA_XIRTULIP=m
 # CONFIG_USB_SERIAL_WHITEHEAT is not set
+CONFIG_MAC_FLOPPY=y

Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/arch/powerpc/config.powerpc-smp
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/arch/powerpc/config.powerpc-smp	2005-07-16 12:27:00 UTC (rev 3554)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/arch/powerpc/config.powerpc-smp	2005-07-16 12:49:55 UTC (rev 3555)
@@ -5,3 +5,4 @@
 CONFIG_IRQ_ALL_CPUS=y
 CONFIG_NR_CPUS=4
 # CONFIG_SOFTWARE_SUSPEND is not set
+# CONFIG_MAC_FLOPPY is not set