diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2012-01-11 15:41:47 +0100 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2012-01-11 15:41:47 +0100 |
| commit | 39b741431af7f6f46b2e0e7f7f13ea2351fb4a5f (patch) | |
| tree | 89355f4ae7bbb874537bb65f71ba0d19b3d468e1 /arch/mips/jazz | |
| parent | Merge branch 'fixes-for-linus' into mips-for-linux-next (diff) | |
| parent | MIPS: Delete unused function add_temporary_entry. (diff) | |
| download | linux-39b741431af7f6f46b2e0e7f7f13ea2351fb4a5f.tar.xz linux-39b741431af7f6f46b2e0e7f7f13ea2351fb4a5f.zip | |
Merge branch 'next/generic' into mips-for-linux-next
Diffstat (limited to 'arch/mips/jazz')
| -rw-r--r-- | arch/mips/jazz/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/jazz/irq.c b/arch/mips/jazz/irq.c index 99ab86ffa4c0..f21868b28b24 100644 --- a/arch/mips/jazz/irq.c +++ b/arch/mips/jazz/irq.c @@ -134,7 +134,7 @@ static irqreturn_t r4030_timer_interrupt(int irq, void *dev_id) static struct irqaction r4030_timer_irqaction = { .handler = r4030_timer_interrupt, - .flags = IRQF_DISABLED | IRQF_TIMER, + .flags = IRQF_TIMER, .name = "R4030 timer", }; |