Merge branch 'master' into upstream-fixes

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/alpha/kernel/irq.c b/arch/alpha/kernel/irq.c
index 729c475d2269..facf82a5499a 100644
--- a/arch/alpha/kernel/irq.c
+++ b/arch/alpha/kernel/irq.c
@@ -127,7 +127,7 @@ unlock:
 #define MAX_ILLEGAL_IRQS 16
 
 void
-handle_irq(int irq, struct pt_regs * regs)
+handle_irq(int irq)
 {       
         /* 
          * We ack quickly, we don't want the irq controller
@@ -157,6 +157,6 @@ handle_irq(int irq, struct pt_regs * regs)
          * at IPL 0.
          */
         local_irq_disable();
-        __do_IRQ(irq, regs);
+        __do_IRQ(irq);
         irq_exit();
 }