Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[linux-2.6-omap-h63xx.git] / drivers / input / tablet / acecad.c

diff --git a/drivers/input/tablet/acecad.c b/drivers/input/tablet/acecad.c
index b973d0ef6d16ae6d332838204a57a20bf184d575..670c61c5a5167b4d10276c2d3399a26c37bb0c9b 100644 (file)
--- a/drivers/input/tablet/acecad.c
+++ b/drivers/input/tablet/acecad.c
@@ -73,10 +73,10 @@ static void usb_acecad_irq(struct urb *urb)
                case -ENOENT:
                case -ESHUTDOWN:
                        /* this urb is terminated, clean up */
-                       dbg("%s - urb shutting down with status: %d", __FUNCTION__, urb->status);
+                       dbg("%s - urb shutting down with status: %d", __func__, urb->status);
                        return;
                default:
-                       dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status);
+                       dbg("%s - nonzero urb status received: %d", __func__, urb->status);
                        goto resubmit;
        }
 
@@ -280,7 +280,8 @@ static int __init usb_acecad_init(void)
 {
        int result = usb_register(&usb_acecad_driver);
        if (result == 0)
-               info(DRIVER_VERSION ":" DRIVER_DESC);
+               printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+                      DRIVER_DESC "\n");
        return result;
 }