Merge master.kernel.org:/home/rmk/linux-2.6-arm

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

diff --git a/arch/alpha/kernel/sys_alcor.c b/arch/alpha/kernel/sys_alcor.c
index 2d412c8765499ed7572f476992bc8208bfaa4d51..e53a1e1c2f217233abfc19ff40249f7bcde269b8 100644 (file)
--- a/arch/alpha/kernel/sys_alcor.c
+++ b/arch/alpha/kernel/sys_alcor.c
@@ -118,7 +118,7 @@ alcor_device_interrupt(unsigned long vector)
                if (i == 31) {
                        isa_device_interrupt(vector);
                } else {
-                       handle_irq(16 + i, get_irq_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;
@@ -259,7 +259,7 @@ alcor_init_pci(void)
        if (dev && dev->devfn == PCI_DEVFN(6,0)) {
                alpha_mv.sys.cia.gru_int_req_bits = XLT_GRU_INT_REQ_BITS; 
                printk(KERN_INFO "%s: Detected AS500 or XLT motherboard.\n",
-                      __FUNCTION__);
+                      __func__);
        }
        pci_dev_put(dev);
 }