---

yaml --- r: 135869 b: refs/heads/master c: 4b2873b h: refs/heads/master i: 135867: e91f09e v: v3
git-mirror · Mar 26, 2009 · a9c3599 · a9c3599
1 parent 007bd6e
commit a9c3599
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95fde7a83989d595c06105629f42f3691bf62f91
+refs/heads/master: 4b2873ba0bda7dc747cde8b6c7dc6c0b01ea6213
diff --git a/trunk/arch/m68k/include/asm/irq_mm.h b/trunk/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;