[PATCH] modular swim3

ACKed by the pmac folks a while ago.  Also moves the Kconfig entry to where
it belongs.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index afb9d4391a7a6e00a4a5d527db22bfe6a74efb0d..c44f27f24847b7dfa6f441e82e99c1f43220ab9b 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

diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index 80b5a8200c726d4a1f9cb61345281304f86ad8c4..78bc356ee3c2e4733adf472bc75f023527444dcb 100644 (file)
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -118,13 +118,6 @@ config PMAC_BACKLIGHT
          events; also, the PowerBook button device will be enabled so you can
          change the screen brightness.
 
-config MAC_FLOPPY
-       bool "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 MAC_SERIAL
        tristate "Support for PowerMac serial ports (OBSOLETE DRIVER)"
        depends on PPC_PMAC && BROKEN

diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c
index 67af530004aac7fd38f2266424e4b1b39968e07f..aa0719775e477f5031962296d39147d50a20ddc1 100644 (file)
--- a/drivers/macintosh/mediabay.c
+++ b/drivers/macintosh/mediabay.c
@@ -435,6 +435,7 @@ int __pmac check_media_bay(struct device_node *which_bay, int what)
 #endif /* CONFIG_BLK_DEV_IDE */
        return -ENODEV;
 }
+EXPORT_SYMBOL(check_media_bay);
 
 int __pmac check_media_bay_by_base(unsigned long base, int what)
 {