Merge tag 'md-3.3-fixes' of git://neil.brown.name/md

[~andy/linux] / arch / mips / kernel / i8253.c

diff --git a/arch/mips/kernel/i8253.c b/arch/mips/kernel/i8253.c
index 7047bff35ea52829a85a9fc94e8f33ad05ead786..c5bc344fc745c4b45a0daa40ea09447f49834cd4 100644 (file)
--- a/arch/mips/kernel/i8253.c
+++ b/arch/mips/kernel/i8253.c
@@ -19,7 +19,7 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id)
 
 static struct irqaction irq0  = {
        .handler = timer_interrupt,
-       .flags = IRQF_DISABLED | IRQF_NOBALANCING | IRQF_TIMER,
+       .flags = IRQF_NOBALANCING | IRQF_TIMER,
        .name = "timer"
 };