Commit 854b9bf8 authored by Thomas Gleixner's avatar Thomas Gleixner

Merge branch 'rt/arm' into rt/base

parents 6652dba0 93a5ba10
...@@ -197,7 +197,7 @@ unsigned long ixp2000_gettimeoffset (void) ...@@ -197,7 +197,7 @@ unsigned long ixp2000_gettimeoffset (void)
return offset / ticks_per_usec; 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 */ /* clear timer 1 */
ixp2000_reg_wrb(IXP2000_T1_CLR, 1); ixp2000_reg_wrb(IXP2000_T1_CLR, 1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment