From c7d688b64cf971c7140e95003156aed39a0cb58a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
Date: Tue, 19 Oct 2010 09:43:59 +0100
Subject: [PATCH] --- yaml --- r: 221022 b: refs/heads/master c:
 d463f3633da7307c4162c4b45e0a94bb7fab44d3 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/mach-ixp2000/core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0dcc81713e10..12c5a35b2a1d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 521e9549d58ebcb53042c7aad6bc60d5c2fc975f
+refs/heads/master: d463f3633da7307c4162c4b45e0a94bb7fab44d3
diff --git a/trunk/arch/arm/mach-ixp2000/core.c b/trunk/arch/arm/mach-ixp2000/core.c
index babb22597163..e24e3d05397f 100644
--- a/trunk/arch/arm/mach-ixp2000/core.c
+++ b/trunk/arch/arm/mach-ixp2000/core.c
@@ -197,7 +197,7 @@ unsigned long ixp2000_gettimeoffset (void)
 	return offset / ticks_per_usec;
 }
 
-static int ixp2000_timer_interrupt(int irq, void *dev_id)
+static irqreturn_t ixp2000_timer_interrupt(int irq, void *dev_id)
 {
 	/* clear timer 1 */
 	ixp2000_reg_wrb(IXP2000_T1_CLR, 1);