git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
arm
/
mach-footbridge
/
isa-timer.c
diff --git
a/arch/arm/mach-footbridge/isa-timer.c
b/arch/arm/mach-footbridge/isa-timer.c
index
c4810a4
..
d884a39
100644
(file)
--- 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;
}