Merge branches 'x86-ras-for-linus', 'x86-uv-for-linus' and 'x86-vdso-for-linus' of...

[mirror_ubuntu-bionic-kernel.git] / arch / frv / kernel / time.c

diff --git a/arch/frv/kernel/time.c b/arch/frv/kernel/time.c
index b457de496b7052272e54857b6687f15d190365ad..332e00bf9d0688b14f29ff5393728e02bdb779d3 100644 (file)
--- a/arch/frv/kernel/time.c
+++ b/arch/frv/kernel/time.c
@@ -44,7 +44,6 @@ static irqreturn_t timer_interrupt(int irq, void *dummy);
 
 static struct irqaction timer_irq  = {
        .handler = timer_interrupt,
-       .flags = IRQF_DISABLED,
        .name = "timer",
 };