diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2012-01-11 09:41:47 -0500 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2012-01-11 09:41:47 -0500 |
| commit | 39b741431af7f6f46b2e0e7f7f13ea2351fb4a5f (patch) | |
| tree | 89355f4ae7bbb874537bb65f71ba0d19b3d468e1 /arch/mips/jazz/irq.c | |
| parent | 5b0ec2efb7d373faa7b1a7632c459b93895d45cd (diff) | |
| parent | d7a887a73dec6c387b02a966a71aac767bbd9ce6 (diff) | |
Merge branch 'next/generic' into mips-for-linux-next
Diffstat (limited to 'arch/mips/jazz/irq.c')
| -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) | |||
| 134 | 134 | ||
| 135 | static struct irqaction r4030_timer_irqaction = { | 135 | static struct irqaction r4030_timer_irqaction = { |
| 136 | .handler = r4030_timer_interrupt, | 136 | .handler = r4030_timer_interrupt, |
| 137 | .flags = IRQF_DISABLED | IRQF_TIMER, | 137 | .flags = IRQF_TIMER, |
| 138 | .name = "R4030 timer", | 138 | .name = "R4030 timer", |
| 139 | }; | 139 | }; |
| 140 | 140 | ||