Merge branch 'rt/arm' into rt/base

854b9bf8 · Thomas Gleixner · 6652dba0 · 93a5ba10 · 854b9bf8
Commit 854b9bf8 authored Aug 12, 2009 by Thomas Gleixner
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

arch/arm/mach-ixp2000/core.c arch/arm/mach-ixp2000/core.c +1 -1

No files found.
--- a/arch/arm/mach-ixp2000/core.c
+++ b/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);