Merge commit 'v2.6.29-rc1' into x86/urgent

[linux-2.6-omap-h63xx.git] / drivers / parisc / asp.c

diff --git a/drivers/parisc/asp.c b/drivers/parisc/asp.c
index 558420bc9f8811527e3b62a0a4d7b5f06fe8c23b..7931133526c48dd57438e9bfb2cda2ef6e784824 100644 (file)
--- a/drivers/parisc/asp.c
+++ b/drivers/parisc/asp.c
@@ -71,8 +71,7 @@ static void asp_choose_irq(struct parisc_device *dev, void *ctrl)
  */
 #define ASP_INTERRUPT_ADDR 0xf0800000
 
-int __init
-asp_init_chip(struct parisc_device *dev)
+static int __init asp_init_chip(struct parisc_device *dev)
 {
        struct gsc_irq gsc_irq;
        int ret;
@@ -88,7 +87,7 @@ asp_init_chip(struct parisc_device *dev)
        ret = -EBUSY;
        dev->irq = gsc_claim_irq(&gsc_irq, ASP_GSC_IRQ);
        if (dev->irq < 0) {
-               printk(KERN_ERR "%s(): cannot get GSC irq\n", __FUNCTION__);
+               printk(KERN_ERR "%s(): cannot get GSC irq\n", __func__);
                goto out;
        }