[PATCH] M68k update (part 18)

Add Sun-3x floppy support (from 2.4.x)

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index aff8acff0ef3a6983c16d3aaad35924e4e5600d6..a91904b58f88132ecfd1e6d6934ec5e62540cf6d 100644 (file)
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -4260,9 +4260,12 @@ int __init floppy_init(void)
                CLEARSTRUCT(FDCS);
                FDCS->dtr = -1;
                FDCS->dor = 0x4;
-#ifdef __sparc__
-               /*sparcs don't have a DOR reset which we can fall back on to*/
-               FDCS->version = FDC_82072A;
+#if defined(__sparc__) || defined(__mc68000__)
+               /*sparcs/sun3x don't have a DOR reset which we can fall back on to*/
+#ifdef __mc68000__
+               if (MACH_IS_SUN3X)
+#endif
+                       FDCS->version = FDC_82072A;             
 #endif
        }