---

yaml --- r: 221022 b: refs/heads/master c: d463f36 h: refs/heads/master v: v3
git-mirror · Oct 27, 2010 · c7d688b · c7d688b
1 parent e87b18f
commit c7d688b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);