diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-11-14 08:38:28 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-11-14 08:38:28 -0500 |
| commit | 0c3c35e148dbc03106038dd25816fb9f3a084d86 (patch) | |
| tree | 8b8cc6a027353a0f242f61362b35b0942da61b83 /arch/mips/kernel/cevt-bcm1480.c | |
| parent | 50d40f187f9182ee8caa1b83f80a0e11e2226baa (diff) | |
| parent | 5e08fe570c2dbabb5015c37049eb9a451e55c890 (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'arch/mips/kernel/cevt-bcm1480.c')
| -rw-r--r-- | arch/mips/kernel/cevt-bcm1480.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/cevt-bcm1480.c b/arch/mips/kernel/cevt-bcm1480.c index e02f79b1eb5..bfea327c636 100644 --- a/arch/mips/kernel/cevt-bcm1480.c +++ b/arch/mips/kernel/cevt-bcm1480.c | |||
| @@ -144,7 +144,7 @@ void __cpuinit sb1480_clockevent_init(void) | |||
| 144 | bcm1480_unmask_irq(cpu, irq); | 144 | bcm1480_unmask_irq(cpu, irq); |
| 145 | 145 | ||
| 146 | action->handler = sibyte_counter_handler; | 146 | action->handler = sibyte_counter_handler; |
| 147 | action->flags = IRQF_DISABLED | IRQF_PERCPU; | 147 | action->flags = IRQF_DISABLED | IRQF_PERCPU | IRQF_TIMER; |
| 148 | action->name = name; | 148 | action->name = name; |
| 149 | action->dev_id = cd; | 149 | action->dev_id = cd; |
| 150 | 150 | ||