Merge ../linux-2.6-watchdog-mm

[linux-drm-fsl-dcu.git] / arch / arm / mach-s3c2410 / bast-irq.c

diff --git a/arch/arm/mach-s3c2410/bast-irq.c b/arch/arm/mach-s3c2410/bast-irq.c
index 440e9aa0211abafad0585c93cc26e86463d72210..23d5beea55680bc04dc45a726945bb85b6f567c8 100644 (file)
--- a/arch/arm/mach-s3c2410/bast-irq.c
+++ b/arch/arm/mach-s3c2410/bast-irq.c
@@ -112,8 +112,7 @@ static struct irqchip  bast_pc104_chip = {
 
 static void
 bast_irq_pc104_demux(unsigned int irq,
-                    struct irqdesc *desc,
-                    struct pt_regs *regs)
+                    struct irqdesc *desc)
 {
        unsigned int stat;
        unsigned int irqno;
@@ -133,7 +132,7 @@ bast_irq_pc104_demux(unsigned int irq,
                        if (stat & 1) {
                                irqno = bast_pc104_irqs[i];
                                desc = irq_desc + irqno;
-                               desc_handle_irq(irqno, desc, regs);
+                               desc_handle_irq(irqno, desc);
                        }
                }
        }