summaryrefslogtreecommitdiff
path: root/arch/sh/kernel/timers/timer-mtu2.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2008-02-15 13:36:30 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2008-02-15 13:36:30 -0500
commit52833e897fd8c6f62b3e5e27291fa9bc803f7460 (patch)
treecfe90047ee6c7402674a29ec7258319142b96ff1 /arch/sh/kernel/timers/timer-mtu2.c
parent8d042218b075de3cdbe066198515b3521553746e (diff)
parent4ee29f6a52158cea526b16a44ae38643946103ec (diff)
downloadlwn-52833e897fd8c6f62b3e5e27291fa9bc803f7460.tar.gz
lwn-52833e897fd8c6f62b3e5e27291fa9bc803f7460.zip
Merge branch 'linus_origin' into hotfixes
Diffstat (limited to 'arch/sh/kernel/timers/timer-mtu2.c')
-rw-r--r--arch/sh/kernel/timers/timer-mtu2.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sh/kernel/timers/timer-mtu2.c b/arch/sh/kernel/timers/timer-mtu2.c
index 463cd08f9517..ade9d6eb29f9 100644
--- a/arch/sh/kernel/timers/timer-mtu2.c
+++ b/arch/sh/kernel/timers/timer-mtu2.c
@@ -154,7 +154,6 @@ static int mtu2_timer_stop(void)
static int mtu2_timer_init(void)
{
- u8 tmp;
unsigned long interval;
setup_irq(CONFIG_SH_TIMER_IRQ, &mtu2_irq);