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

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