Skip to content

Commit

Permalink
ARM: 6460/1: ixp2000: fix type of ixp2000_timer_interrupt
Browse files Browse the repository at this point in the history
This fixes a build warning existing since at least 2.6.30:

	arch/arm/mach-ixp2000/core.c:217: warning: initialization from incompatible pointer type

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Uwe Kleine-König authored and Russell King committed Oct 27, 2010
1 parent 521e954 commit d463f36
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/arm/mach-ixp2000/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit d463f36

Please sign in to comment.