diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-03-31 05:08:33 +0200 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-03-31 05:08:33 +0200 |
| commit | 930861c4e6f13ce2e7d06cd1ef11441a065517d9 (patch) | |
| tree | df6ff01f89768ff8d6fe6a64491be30e6e56c3e0 /arch/m68k/include/asm/macintosh.h | |
| parent | xfs: increase the maximum number of supported ACL entries (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | linux-930861c4e6f13ce2e7d06cd1ef11441a065517d9.tar.xz linux-930861c4e6f13ce2e7d06cd1ef11441a065517d9.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/m68k/include/asm/macintosh.h')
| -rw-r--r-- | arch/m68k/include/asm/macintosh.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/macintosh.h b/arch/m68k/include/asm/macintosh.h index 05309f7e3d06..50db3591ca15 100644 --- 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 */ |