Merge branch 'for-2.6.30' into for-2.6.31

[karo-tx-linux.git] / arch / m68k / include / asm / macintosh.h

diff --git a/arch/m68k/include/asm/macintosh.h b/arch/m68k/include/asm/macintosh.h
index 05309f7e3d0638b079802a4d3e76b8b9827596cb..50db3591ca15194c629a9aa3030122b6eb74946b 100644 (file)
--- a/arch/m68k/include/asm/macintosh.h
+++ b/arch/m68k/include/asm/macintosh.h
@@ -34,6 +34,7 @@ struct mac_model
        char scc_type;
        char ether_type;
        char nubus_type;
+       char floppy_type;
 };
 
 #define MAC_ADB_NONE           0
@@ -71,6 +72,12 @@ struct mac_model
 #define MAC_NO_NUBUS           0
 #define MAC_NUBUS              1
 
+#define MAC_FLOPPY_IWM         0
+#define MAC_FLOPPY_SWIM_ADDR1  1
+#define MAC_FLOPPY_SWIM_ADDR2  2
+#define MAC_FLOPPY_SWIM_IOP    3
+#define MAC_FLOPPY_AV          4
+
 /*
  *     Gestalt numbers
  */