Merge remote-tracking branch 'imx-mxs/for-next'

[karo-tx-linux.git] / arch / arm / mach-imx / epit.c

diff --git a/arch/arm/mach-imx/epit.c b/arch/arm/mach-imx/epit.c
index e02de188ae83ba7a5e51b4184f1cc85c05c86d34..074b1a81ba764aa2caeecf6f973c3807e2f5b4a2 100644 (file)
--- a/arch/arm/mach-imx/epit.c
+++ b/arch/arm/mach-imx/epit.c
@@ -171,7 +171,7 @@ static irqreturn_t epit_timer_interrupt(int irq, void *dev_id)
 
 static struct irqaction epit_timer_irq = {
        .name           = "i.MX EPIT Timer Tick",
-       .flags          = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
+       .flags          = IRQF_TIMER | IRQF_IRQPOLL,
        .handler        = epit_timer_interrupt,
 };