diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-04-01 22:17:41 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-01 22:17:41 -0400 |
| commit | c4361bb64b81f5b81a7a08d58654493385a2f2b2 (patch) | |
| tree | 8741c0b60ddfbc3fc4e17c8d200f6aa6ff32cca0 /arch/sh/kernel/timers/timer-tmu.c | |
| parent | 46368fa05164e1afdc1401294908cf30c6d8d981 (diff) | |
| parent | 833bb3046b6cb320e775ea2160ddca87d53260d5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/sh/kernel/timers/timer-tmu.c')
| -rw-r--r-- | arch/sh/kernel/timers/timer-tmu.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sh/kernel/timers/timer-tmu.c b/arch/sh/kernel/timers/timer-tmu.c index 10b5a6f17cc0..c5d3396f5960 100644 --- a/arch/sh/kernel/timers/timer-tmu.c +++ b/arch/sh/kernel/timers/timer-tmu.c | |||
| @@ -162,7 +162,6 @@ static struct irqaction tmu0_irq = { | |||
| 162 | .name = "periodic/oneshot timer", | 162 | .name = "periodic/oneshot timer", |
| 163 | .handler = tmu_timer_interrupt, | 163 | .handler = tmu_timer_interrupt, |
| 164 | .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL, | 164 | .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL, |
| 165 | .mask = CPU_MASK_NONE, | ||
| 166 | }; | 165 | }; |
| 167 | 166 | ||
| 168 | static void __init tmu_clk_init(struct clk *clk) | 167 | static void __init tmu_clk_init(struct clk *clk) |