Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

[linux-2.6] / drivers / isdn / capi / capidrv.c

diff --git a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c
index 2e602dd07ffa1f25acdf246c6295da1cb75b5122..d5b4cc357a3c77dff03b704070063e2bed0ac11c 100644 (file)
--- a/drivers/isdn/capi/capidrv.c
+++ b/drivers/isdn/capi/capidrv.c
@@ -1388,12 +1388,12 @@ static void capidrv_recv_message(struct capi20_appl *ap, struct sk_buff *skb)
                _cdebbuf *cdb = capi_cmsg2str(&s_cmsg);
 
                if (cdb) {
-                       printk(KERN_DEBUG "%s: applid=%d %s\n", __FUNCTION__,
+                       printk(KERN_DEBUG "%s: applid=%d %s\n", __func__,
                                ap->applid, cdb->buf);
                        cdebbuf_free(cdb);
                } else
                        printk(KERN_DEBUG "%s: applid=%d %s not traced\n",
-                               __FUNCTION__, ap->applid,
+                               __func__, ap->applid,
                                capi_cmd2str(s_cmsg.Command, s_cmsg.Subcommand));
        }
        if (s_cmsg.Command == CAPI_DATA_B3