Merge remote branch 'wireless-next/master' into ath6kl-next

[firefly-linux-kernel-4.4.55.git] / arch / mips / jazz / irq.c

diff --git a/arch/mips/jazz/irq.c b/arch/mips/jazz/irq.c
index 99ab86ffa4c013c926647d60c7f805fdc87ceae9..f21868b28b24e19575d49210bb709333d3653309 100644 (file)
--- 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",
 };