remove asm/bitops.h includes

[sfrench/cifs-2.6.git] / arch / frv / kernel / irq-mb93493.c

diff --git a/arch/frv/kernel/irq-mb93493.c b/arch/frv/kernel/irq-mb93493.c
index 39c0188a3498e0337e33c3e5bff3962cb42298f2..7754c7338e4b42cfaeb4c3a76158665f3b05d275 100644 (file)
--- a/arch/frv/kernel/irq-mb93493.c
+++ b/arch/frv/kernel/irq-mb93493.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>
@@ -90,7 +90,7 @@ static struct irq_chip frv_mb93493_pic = {
 /*
  * MB93493 PIC interrupt handler
  */
-static irqreturn_t mb93493_interrupt(int irq, void *_piqsr, struct pt_regs *regs)
+static irqreturn_t mb93493_interrupt(int irq, void *_piqsr)
 {
        volatile void *piqsr = _piqsr;
        uint32_t iqsr;
@@ -106,7 +106,7 @@ static irqreturn_t mb93493_interrupt(int irq, void *_piqsr, struct pt_regs *regs
                irq = 31 - irq;
                iqsr &= ~(1 << irq);
 
-               generic_handle_irq(IRQ_BASE_MB93493 + irq, regs);
+               generic_handle_irq(IRQ_BASE_MB93493 + irq);
        }
 
        return IRQ_HANDLED;