Merge commit 'upstream/master'

[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..570e0e83ac46c99644c05d7166a5318cea4f66cb 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;
        }