Merge to Fedora Core 2 kernel-2.6.8-1.521

[linux-2.6.git] / drivers / block / Kconfig

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index afb9d43..c44f27f 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -33,6 +33,13 @@ config BLK_DEV_SWIM_IOP
          Say Y here to support the SWIM (Super Woz Integrated Machine) IOP
          floppy controller on the Macintosh IIfx and Quadra 900/950.
 
+config MAC_FLOPPY
+       tristate "Support for PowerMac floppy"
+       depends on PPC_PMAC && !PPC_PMAC64
+       help
+         If you have a SWIM-3 (Super Woz Integrated Machine 3; from Apple)
+         floppy controller, say Y here. Most commonly found in PowerMacs.
+
 config BLK_DEV_PS2
        tristate "PS/2 ESDI hard disk support"
        depends on MCA && MCA_LEGACY