summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-footbridge/isa-timer.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-06 10:53:39 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-06 10:59:54 -0700
commit0cd61b68c340a4f901a06e8bb5e0dea4353161c0 (patch)
treecfd72be941ecd172627a06dd61d98b55cec63a39 /arch/arm/mach-footbridge/isa-timer.c
parentda104a83692cf07434ab3b20bf10093bdbc3f97e (diff)
downloadop-kernel-dev-0cd61b68c340a4f901a06e8bb5e0dea4353161c0.zip
op-kernel-dev-0cd61b68c340a4f901a06e8bb5e0dea4353161c0.tar.gz
Initial blind fixup for arm for irq changes
Untested, but this should fix up the bulk of the totally mechanical issues, and should make the actual detail fixing easier. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/arm/mach-footbridge/isa-timer.c')
-rw-r--r--arch/arm/mach-footbridge/isa-timer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-footbridge/isa-timer.c b/arch/arm/mach-footbridge/isa-timer.c
index c4810a4..d884a39 100644
--- a/arch/arm/mach-footbridge/isa-timer.c
+++ b/arch/arm/mach-footbridge/isa-timer.c
@@ -62,10 +62,10 @@ static unsigned long isa_gettimeoffset(void)
}
static irqreturn_t
-isa_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+isa_timer_interrupt(int irq, void *dev_id)
{
write_seqlock(&xtime_lock);
- timer_tick(regs);
+ timer_tick();
write_sequnlock(&xtime_lock);
return IRQ_HANDLED;
}
OpenPOWER on IntegriCloud