diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-10-19 09:43:59 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-27 21:40:28 +0100 |
| commit | d463f3633da7307c4162c4b45e0a94bb7fab44d3 (patch) | |
| tree | 244c9a7adddbba964d29dbefb44d0bba859935c3 /arch/arm/mach-ixp2000 | |
| parent | 521e9549d58ebcb53042c7aad6bc60d5c2fc975f (diff) | |
| download | linux-3.10-d463f3633da7307c4162c4b45e0a94bb7fab44d3.tar.gz linux-3.10-d463f3633da7307c4162c4b45e0a94bb7fab44d3.tar.bz2 linux-3.10-d463f3633da7307c4162c4b45e0a94bb7fab44d3.zip | |
ARM: 6460/1: ixp2000: fix type of ixp2000_timer_interrupt
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>
Diffstat (limited to 'arch/arm/mach-ixp2000')
| -rw-r--r-- | 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 babb2259716..e24e3d05397 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); |