Merge branch 'for-linus' of git://linux-nfs.org/~bfields/linux

[linux-2.6] / arch / alpha / kernel / sys_alcor.c

diff --git a/arch/alpha/kernel/sys_alcor.c b/arch/alpha/kernel/sys_alcor.c
index d6926b7b1e994b3dde36c9f7c77991ea55102227..d187d01d2a17b72dc603241c26c85b6cf426d1ad 100644 (file)
--- a/arch/alpha/kernel/sys_alcor.c
+++ b/arch/alpha/kernel/sys_alcor.c
@@ -100,7 +100,7 @@ static struct hw_interrupt_type alcor_irq_type = {
 };
 
 static void
-alcor_device_interrupt(unsigned long vector, struct pt_regs *regs)
+alcor_device_interrupt(unsigned long vector)
 {
        unsigned long pld;
        unsigned int i;
@@ -116,9 +116,9 @@ alcor_device_interrupt(unsigned long vector, struct pt_regs *regs)
                i = ffz(~pld);
                pld &= pld - 1; /* clear least bit set */
                if (i == 31) {
-                       isa_device_interrupt(vector, regs);
+                       isa_device_interrupt(vector);
                } else {
-                       handle_irq(16 + i, regs);
+                       handle_irq(16 + i);
                }
        }
 }
@@ -138,7 +138,7 @@ alcor_init_irq(void)
 
        for (i = 16; i < 48; ++i) {
                /* On Alcor, at least, lines 20..30 are not connected
-                  and can generate spurrious interrupts if we turn them
+                  and can generate spurious interrupts if we turn them
                   on while IRQ probing.  */
                if (i >= 16+20 && i <= 16+30)
                        continue;