Merge branch 'tracing/urgent' into tracing/ftrace

[mv-sheeva.git] / arch / frv / kernel / irq-mb93093.c

diff --git a/arch/frv/kernel/irq-mb93093.c b/arch/frv/kernel/irq-mb93093.c
index e0983f6926ed77be5b8874a7624051c258b63bc4..e45209031873e63de6e0202bbd3e831a29ff27bb 100644 (file)
--- a/arch/frv/kernel/irq-mb93093.c
+++ b/arch/frv/kernel/irq-mb93093.c
@@ -17,10 +17,10 @@
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/irq.h>
+#include <linux/bitops.h>
 
 #include <asm/io.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/delay.h>
 #include <asm/irq.h>
 #include <asm/irc-regs.h>
@@ -108,7 +108,6 @@ static struct irqaction fpga_irq[1]  = {
        [0] = {
                .handler        = fpga_interrupt,
                .flags          = IRQF_DISABLED,
-               .mask           = CPU_MASK_NONE,
                .name           = "fpga.0",
                .dev_id         = (void *) 0x0700UL,
        }