From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?utf-8?q?Uwe=20Kleine-K=C3=B6nig?= Subject: [PATCH 4/6] [ARM] ixp2000: fix type of ixp2000_timer_interrupt Date: Fri, 7 Aug 2009 22:42:39 +0200 Message-ID: <1249677761-19470-4-git-send-email-u.kleine-koenig@pengutronix.de> References: <20090807203939.GA19374@pengutronix.de> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: LKML , rt-users , Russell King , Dmitry Baryshkov To: Thomas Gleixner Return-path: In-Reply-To: <20090807203939.GA19374@pengutronix.de> Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-rt-users.vger.kernel.org This fixes a build warning for 2.6.31-rc5 (ARCH=3Darm, ixp2000_defconfi= g): CC arch/arm/mach-ixp2000/core.o arch/arm/mach-ixp2000/core.c:217: warning: initialization from incompa= tible pointer type Signed-off-by: Uwe Kleine-K=C3=B6nig Cc: Russell King Cc: Dmitry Baryshkov --- 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; } =20 -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); --=20 1.6.3.3