Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

[pandora-kernel.git] / arch / alpha / kernel / sys_alcor.c

diff --git a/arch/alpha/kernel/sys_alcor.c b/arch/alpha/kernel/sys_alcor.c
index d187d01..382035e 100644 (file)
--- a/arch/alpha/kernel/sys_alcor.c
+++ b/arch/alpha/kernel/sys_alcor.c
@@ -89,7 +89,7 @@ alcor_end_irq(unsigned int irq)
                alcor_enable_irq(irq);
 }
 
-static struct hw_interrupt_type alcor_irq_type = {
+static struct irq_chip alcor_irq_type = {
        .typename       = "ALCOR",
        .startup        = alcor_startup_irq,
        .shutdown       = alcor_disable_irq,
@@ -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);
 }