Merge branch 'linus' into x86/core

[linux-2.6-omap-h63xx.git] / net / irda / irlan / irlan_filter.c

diff --git a/net/irda/irlan/irlan_filter.c b/net/irda/irlan/irlan_filter.c
index 4384be9a6888776baffce9b20393bbb59f830aa6..9ff7823abec75c5ef3fd8dec485b697902e95ab1 100644 (file)
--- a/net/irda/irlan/irlan_filter.c
+++ b/net/irda/irlan/irlan_filter.c
@@ -145,7 +145,7 @@ void irlan_check_command_param(struct irlan_cb *self, char *param, char *value)
 {
        __u8 *bytes;
 
-       IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
+       IRDA_DEBUG(4, "%s()\n", __func__ );
 
        bytes = value;
 
@@ -158,7 +158,7 @@ void irlan_check_command_param(struct irlan_cb *self, char *param, char *value)
         *  This is experimental!! DB.
         */
         if (strcmp(param, "MODE") == 0) {
-               IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
+               IRDA_DEBUG(0, "%s()\n", __func__ );
                self->use_udata = TRUE;
                return;
        }