Merge ../linus

[linux-drm-fsl-dcu.git] / arch / mips / emma2rh / common / irq.c

diff --git a/arch/mips/emma2rh/common/irq.c b/arch/mips/emma2rh/common/irq.c
index b075281e50e95d53b8c291a1f72fd318eb65f66e..c191b3e9d9d9e3101a9614fb4be17f0fa55bd9b6 100644 (file)
--- a/arch/mips/emma2rh/common/irq.c
+++ b/arch/mips/emma2rh/common/irq.c
@@ -22,7 +22,6 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
@@ -40,7 +39,7 @@
 /*
  * the first level int-handler will jump here if it is a emma2rh irq
  */
-asmlinkage void emma2rh_irq_dispatch(struct pt_regs *regs)
+void emma2rh_irq_dispatch(void)
 {
        u32 intStatus;
        u32 bitmask;
@@ -57,7 +56,7 @@ asmlinkage void emma2rh_irq_dispatch(struct pt_regs *regs)
                    & emma2rh_in32(EMMA2RH_BHIF_SW_INT_EN);
                for (i = 0, bitmask = 1; i < 32; i++, bitmask <<= 1) {
                        if (swIntStatus & bitmask) {
-                               do_IRQ(EMMA2RH_SW_IRQ_BASE + i, regs);
+                               do_IRQ(EMMA2RH_SW_IRQ_BASE + i);
                                return;
                        }
                }
@@ -66,7 +65,7 @@ asmlinkage void emma2rh_irq_dispatch(struct pt_regs *regs)
 
        for (i = 0, bitmask = 1; i < 32; i++, bitmask <<= 1) {
                if (intStatus & bitmask) {
-                       do_IRQ(EMMA2RH_IRQ_BASE + i, regs);
+                       do_IRQ(EMMA2RH_IRQ_BASE + i);
                        return;
                }
        }
@@ -82,7 +81,7 @@ asmlinkage void emma2rh_irq_dispatch(struct pt_regs *regs)
                    & emma2rh_in32(EMMA2RH_GPIO_INT_MASK);
                for (i = 0, bitmask = 1; i < 32; i++, bitmask <<= 1) {
                        if (gpioIntStatus & bitmask) {
-                               do_IRQ(EMMA2RH_GPIO_IRQ_BASE + i, regs);
+                               do_IRQ(EMMA2RH_GPIO_IRQ_BASE + i);
                                return;
                        }
                }
@@ -91,7 +90,7 @@ asmlinkage void emma2rh_irq_dispatch(struct pt_regs *regs)
 
        for (i = 32, bitmask = 1; i < 64; i++, bitmask <<= 1) {
                if (intStatus & bitmask) {
-                       do_IRQ(EMMA2RH_IRQ_BASE + i, regs);
+                       do_IRQ(EMMA2RH_IRQ_BASE + i);
                        return;
                }
        }
@@ -101,7 +100,7 @@ asmlinkage void emma2rh_irq_dispatch(struct pt_regs *regs)
 
        for (i = 64, bitmask = 1; i < 96; i++, bitmask <<= 1) {
                if (intStatus & bitmask) {
-                       do_IRQ(EMMA2RH_IRQ_BASE + i, regs);
+                       do_IRQ(EMMA2RH_IRQ_BASE + i);
                        return;
                }
        }