projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge ../linux-2.6-watchdog-mm
[linux-drm-fsl-dcu.git]
/
arch
/
arm
/
mach-footbridge
/
dc21285-timer.c
diff --git
a/arch/arm/mach-footbridge/dc21285-timer.c
b/arch/arm/mach-footbridge/dc21285-timer.c
index 2af610811ca4247bda63c9a885163ba4891911e4..fa6be870c6c20cac3896bacfda7f52cbd93d6b85 100644
(file)
--- a/
arch/arm/mach-footbridge/dc21285-timer.c
+++ b/
arch/arm/mach-footbridge/dc21285-timer.c
@@
-28,13
+28,13
@@
static unsigned long timer1_gettimeoffset (void)
}
static irqreturn_t
-timer1_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+timer1_interrupt(int irq, void *dev_id)
{
write_seqlock(&xtime_lock);
*CSR_TIMER1_CLR = 0;
- timer_tick(
regs
);
+ timer_tick();
write_sequnlock(&xtime_lock);