From 8272560e8ded431eacf24621010b0cd57346feba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Fri, 7 Aug 2009 22:42:39 +0200 Subject: [PATCH] ARM: ixp2000: fix type of ixp2000_timer_interrupt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 93a5ba103458201ebb0f2e75cd02401e2d169f2d in tip. 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: Uwe Kleine-König Cc: Russell King Cc: Dmitry Baryshkov LKML-Reference: <1249677761-19470-4-git-send-email-u.kleine-koenig@pengutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Paul Gortmaker --- arch/arm/mach-ixp2000/core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c index babb225..e24e3d0 100644 --- 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); -- 1.7.0.4