From 1d41e52b3cfa2bf47280f69adc4dbdd0e3139a57 Mon Sep 17 00:00:00 2001 From: Sven Luther Date: Sat, 16 Jul 2005 12:49:55 +0000 Subject: [PATCH] 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. svn path=/trunk/kernel/source/linux-2.6-2.6.12/; revision=3555 --- debian/arch/powerpc/config | 1 - debian/arch/powerpc/config.powerpc | 1 + debian/arch/powerpc/config.powerpc-smp | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/arch/powerpc/config b/debian/arch/powerpc/config index 7b426992a..0ac41a42d 100644 --- a/debian/arch/powerpc/config +++ b/debian/arch/powerpc/config @@ -119,7 +119,6 @@ CONFIG_FW_LOADER=m # 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 diff --git a/debian/arch/powerpc/config.powerpc b/debian/arch/powerpc/config.powerpc index 39d9f586e..3c8c54a92 100644 --- a/debian/arch/powerpc/config.powerpc +++ b/debian/arch/powerpc/config.powerpc @@ -7,3 +7,4 @@ CONFIG_6PACK=m # CONFIG_IRPORT_SIR is not set CONFIG_PCMCIA_XIRTULIP=m # CONFIG_USB_SERIAL_WHITEHEAT is not set +CONFIG_MAC_FLOPPY=y diff --git a/debian/arch/powerpc/config.powerpc-smp b/debian/arch/powerpc/config.powerpc-smp index c778fd5e0..860b8fcca 100644 --- a/debian/arch/powerpc/config.powerpc-smp +++ b/debian/arch/powerpc/config.powerpc-smp @@ -5,3 +5,4 @@ CONFIG_SMP=y CONFIG_IRQ_ALL_CPUS=y CONFIG_NR_CPUS=4 # CONFIG_SOFTWARE_SUSPEND is not set +# CONFIG_MAC_FLOPPY is not set