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

2 files changed, 9 insertions, 1 deletions

diff --git a/arch/m68k/include/asm/irq_mm.h b/arch/m68k/include/asm/irq_mm.h
index 226bfc0f21b1..0cab42cad79e 100644
--- a/arch/m68k/include/asm/irq_mm.h
+++ b/arch/m68k/include/asm/irq_mm.h
@@ -3,6 +3,7 @@
 
 #include <linux/linkage.h>
 #include <linux/hardirq.h>
+#include <linux/irqreturn.h>
 #include <linux/spinlock_types.h>
 
 /*
@@ -80,7 +81,7 @@ struct pt_regs;
  * interrupt source (if it supports chaining).
  */
 typedef struct irq_node {
-        int             (*handler)(int, void *);
+        irqreturn_t     (*handler)(int, void *);
         void            *dev_id;
         struct irq_node *next;
         unsigned long   flags;
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
  */