diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-27 02:15:31 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-27 02:15:31 +0300 |
| commit | 4496d937a518fde0d0e1980e4ab470cedb4b50cd (patch) | |
| tree | a02d57e13b44483417973a306f9fd23743959375 /drivers/block/Kconfig | |
| parent | 8e9d2089723d08d51e66c5eea49253d76e27941e (diff) | |
| parent | 4b2873ba0bda7dc747cde8b6c7dc6c0b01ea6213 (diff) | |
| download | linux-4496d937a518fde0d0e1980e4ab470cedb4b50cd.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: irq_node.handler() should return irqreturn_t
m68k: section mismatch fixes: Atari SCSI
m68k: section mismatch fixes: DMAsound for Atari
MAINTAINERS: Replace dead link to m68k CVS repository by link to new git repository
m68k: mac - Add SWIM floppy support
m68k: mac - Add a new entry in mac_model to identify the floppy controller type.
m68k: Add install target
Diffstat (limited to 'drivers/block/Kconfig')
| -rw-r--r-- | drivers/block/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index 0344a8a8321d..e7b8aa0cb47c 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -45,6 +45,13 @@ config MAC_FLOPPY 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_SWIM + tristate "Support for SWIM Macintosh floppy" + depends on M68K && MAC + help + You should select this option if you want floppy support + and you don't have a II, IIfx, Q900, Q950 or AV series. + config AMIGA_Z2RAM tristate "Amiga Zorro II ramdisk support" depends on ZORRO |