From a9c35994c1d819f6b962ef7acc9b4781f47294ee Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Thu, 26 Mar 2009 09:48:45 +0100
Subject: [PATCH] --- yaml --- r: 135869 b: refs/heads/master c:
 4b2873ba0bda7dc747cde8b6c7dc6c0b01ea6213 h: refs/heads/master i:   135867:
 e91f09e88c3313ff506124701fe615acae1f10f3 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/m68k/include/asm/irq_mm.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 100b5ff3dcb5..b0fdc10f9340 100644
--- 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
index 226bfc0f21b1..0cab42cad79e 100644
--- 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;