diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-01-17 22:55:28 +1000 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-17 22:55:28 +1000 |
| commit | 0c929238ca4baefe47f4034732db4c154f2329c6 (patch) | |
| tree | 2636079800fa045501982a70e1be0425c1b968c2 /arch/mips/kernel/cevt-sb1250.c | |
| parent | 6d7120a713300283a8b73e7d86cd1bab8b9d1971 (diff) | |
| parent | 78da107a7ed14fbc6ef77ff4c41d92b11edc9036 (diff) | |
Merge branch 'sh/platform-updates' into sh-latest
Diffstat (limited to 'arch/mips/kernel/cevt-sb1250.c')
| -rw-r--r-- | arch/mips/kernel/cevt-sb1250.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/cevt-sb1250.c b/arch/mips/kernel/cevt-sb1250.c index 590c54f28a81..e73439fd6850 100644 --- a/arch/mips/kernel/cevt-sb1250.c +++ b/arch/mips/kernel/cevt-sb1250.c @@ -144,7 +144,7 @@ void __cpuinit sb1250_clockevent_init(void) sb1250_unmask_irq(cpu, irq); action->handler = sibyte_counter_handler; - action->flags = IRQF_DISABLED | IRQF_PERCPU | IRQF_TIMER; + action->flags = IRQF_PERCPU | IRQF_TIMER; action->name = name; action->dev_id = cd; |