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 d187d01d2a17b72dc603241c26c85b6cf426d1ad..e53a1e1c2f217233abfc19ff40249f7bcde269b8 100644 (file)
--- a/arch/alpha/kernel/sys_alcor.c
+++ b/arch/alpha/kernel/sys_alcor.c
@@ -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);
 }