Merge branch 'master' into next

[linux-2.6-omap-h63xx.git] / arch / alpha / kernel / sys_cabriolet.c

diff --git a/arch/alpha/kernel/sys_cabriolet.c b/arch/alpha/kernel/sys_cabriolet.c
index 25a215067da8a55111a55ca8ec83e8eaa8e5f9a6..ace475c124f69d9d2e248268e8ef3436c4262f1e 100644 (file)
--- a/arch/alpha/kernel/sys_cabriolet.c
+++ b/arch/alpha/kernel/sys_cabriolet.c
@@ -82,7 +82,7 @@ static struct hw_interrupt_type cabriolet_irq_type = {
 };
 
 static void 
-cabriolet_device_interrupt(unsigned long v, struct pt_regs *r)
+cabriolet_device_interrupt(unsigned long v)
 {
        unsigned long pld;
        unsigned int i;
@@ -98,15 +98,15 @@ cabriolet_device_interrupt(unsigned long v, struct pt_regs *r)
                i = ffz(~pld);
                pld &= pld - 1; /* clear least bit set */
                if (i == 4) {
-                       isa_device_interrupt(v, r);
+                       isa_device_interrupt(v);
                } else {
-                       handle_irq(16 + i, r);
+                       handle_irq(16 + i);
                }
        }
 }
 
 static void __init
-common_init_irq(void (*srm_dev_int)(unsigned long v, struct pt_regs *r))
+common_init_irq(void (*srm_dev_int)(unsigned long v))
 {
        init_i8259a_irqs();
 
@@ -154,18 +154,18 @@ cabriolet_init_irq(void)
    too invasive though.  */
 
 static void
-pc164_srm_device_interrupt(unsigned long v, struct pt_regs *r)
+pc164_srm_device_interrupt(unsigned long v)
 {
        __min_ipl = getipl();
-       srm_device_interrupt(v, r);
+       srm_device_interrupt(v);
        __min_ipl = 0;
 }
 
 static void
-pc164_device_interrupt(unsigned long v, struct pt_regs *r)
+pc164_device_interrupt(unsigned long v)
 {
        __min_ipl = getipl();
-       cabriolet_device_interrupt(v, r);
+       cabriolet_device_interrupt(v);
        __min_ipl = 0;
 }