public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] modular swim3
@ 2004-07-07 20:39 Christoph Hellwig
  2004-07-07 20:48 ` Benjamin Herrenschmidt
  0 siblings, 1 reply; 4+ messages in thread
From: Christoph Hellwig @ 2004-07-07 20:39 UTC (permalink / raw)
  To: benh; +Cc: linux-kernel

Needs one magic mediabay symbol exported.  I've also moved the Kconfig
entry to where it belongs.


--- 1.24/drivers/block/Kconfig	2004-06-21 20:52:50 +02:00
+++ edited/drivers/block/Kconfig	2004-07-07 23:30:10 +02:00
@@ -33,6 +33,13 @@
 	  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
--- 1.7/drivers/macintosh/Kconfig	2004-05-19 18:02:46 +02:00
+++ edited/drivers/macintosh/Kconfig	2004-07-07 23:49:37 +02:00
@@ -118,13 +118,6 @@
 	  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
--- 1.12/drivers/macintosh/mediabay.c	2004-03-14 02:57:41 +01:00
+++ edited/drivers/macintosh/mediabay.c	2004-07-08 00:06:35 +02:00
@@ -435,6 +435,7 @@
 #endif /* CONFIG_BLK_DEV_IDE */
 	return -ENODEV;
 }
+EXPORT_SYMBOL(check_media_bay);
 
 int __pmac check_media_bay_by_base(unsigned long base, int what)
 {

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2004-07-07 21:00 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-07-07 20:39 [PATCH] modular swim3 Christoph Hellwig
2004-07-07 20:48 ` Benjamin Herrenschmidt
2004-07-07 20:51   ` Christoph Hellwig
2004-07-07 20:59   ` Paul Wagland

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox