Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next

[pandora-kernel.git] / net / irda / irmod.c

diff --git a/net/irda/irmod.c b/net/irda/irmod.c
index 01554b9..4c487a8 100644 (file)
--- a/net/irda/irmod.c
+++ b/net/irda/irmod.c
@@ -90,7 +90,7 @@ static int __init irda_init(void)
 {
        int ret = 0;
 
-       IRDA_DEBUG(0, "%s()\n", __FUNCTION__);
+       IRDA_DEBUG(0, "%s()\n", __func__);
 
        /* Lower layer of the stack */
        irlmp_init();