Commit 93a5ba10 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Thomas Gleixner

ARM: ixp2000: fix type of ixp2000_timer_interrupt

This fixes a build warning for 2.6.31-rc5 (ARCH=arm, ixp2000_defconfig):

 CC      arch/arm/mach-ixp2000/core.o
 arch/arm/mach-ixp2000/core.c:217: warning: initialization from incompatible pointer type
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Dmitry Baryshkov <dbaryshkov@gmail.com>
LKML-Reference: <1249677761-19470-4-git-send-email-u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 91e45cb1
......@@ -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);
......
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