patch-2.1.51 linux/drivers/block/ll_rw_blk.c

Next file: linux/drivers/block/swim3.c
Previous file: linux/drivers/block/genhd.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.50/linux/drivers/block/ll_rw_blk.c linux/drivers/block/ll_rw_blk.c
@@ -681,10 +681,13 @@
 #ifdef CONFIG_BLK_DEV_EZ
 	ez_init();
 #endif
+#ifdef CONFIG_MAC_FLOPPY
+	swim3_init();
+#endif
 #ifdef CONFIG_BLK_DEV_FD
 	floppy_init();
 #else
-#if !defined (__mc68000__)
+#if !defined (__mc68000__) && !defined(CONFIG_PMAC) && !defined(__sparc__)
 	outb_p(0xc, 0x3f2);
 #endif
 #endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov