diff options
author | Paul Mundt <lethal@linux-sh.org> | 2006-10-06 02:31:16 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2006-10-06 02:31:16 -0400 |
commit | 35f3c5185b1e28e6591aa649db8bf4fa16f1a7f3 (patch) | |
tree | d3057d468d36664d1accf964e76f6d97a299b40d /arch/sh/kernel/timers/timer-tmu.c | |
parent | a700f3594d63a85af196ac64984f7375d903afad (diff) |
sh: Updates for IRQ handler changes.
Trivial fixes for build breakage introduced by IRQ handler changes.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/timers/timer-tmu.c')
-rw-r--r-- | arch/sh/kernel/timers/timer-tmu.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/sh/kernel/timers/timer-tmu.c b/arch/sh/kernel/timers/timer-tmu.c index badfedb455a9..24927015dc31 100644 --- a/arch/sh/kernel/timers/timer-tmu.c +++ b/arch/sh/kernel/timers/timer-tmu.c | |||
@@ -80,8 +80,7 @@ static unsigned long tmu_timer_get_offset(void) | |||
80 | return count; | 80 | return count; |
81 | } | 81 | } |
82 | 82 | ||
83 | static irqreturn_t tmu_timer_interrupt(int irq, void *dev_id, | 83 | static irqreturn_t tmu_timer_interrupt(int irq, void *dummy) |
84 | struct pt_regs *regs) | ||
85 | { | 84 | { |
86 | unsigned long timer_status; | 85 | unsigned long timer_status; |
87 | 86 | ||
@@ -98,7 +97,7 @@ static irqreturn_t tmu_timer_interrupt(int irq, void *dev_id, | |||
98 | * locally disabled. -arca | 97 | * locally disabled. -arca |
99 | */ | 98 | */ |
100 | write_seqlock(&xtime_lock); | 99 | write_seqlock(&xtime_lock); |
101 | handle_timer_tick(regs); | 100 | handle_timer_tick(); |
102 | write_sequnlock(&xtime_lock); | 101 | write_sequnlock(&xtime_lock); |
103 | 102 | ||
104 | return IRQ_HANDLED; | 103 | return IRQ_HANDLED; |