[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1249677761-19470-4-git-send-email-u.kleine-koenig@pengutronix.de>
Date: Fri, 7 Aug 2009 22:42:39 +0200
From: Uwe Kleine-König
<u.kleine-koenig@...gutronix.de>
To: Thomas Gleixner <tglx@...utronix.de>
Cc: LKML <linux-kernel@...r.kernel.org>,
rt-users <linux-rt-users@...r.kernel.org>,
Russell King <linux@....linux.org.uk>,
Dmitry Baryshkov <dbaryshkov@...il.com>
Subject: [PATCH 4/6] [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: Uwe Kleine-König <u.kleine-koenig@...gutronix.de>
Cc: Russell King <linux@....linux.org.uk>
Cc: Dmitry Baryshkov <dbaryshkov@...il.com>
---
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.6.3.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists