Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 into lvs-next-2.6

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/net/arcnet/com20020.c b/drivers/net/arcnet/com20020.c
index 8b51313b1300..70124a944e7d 100644
--- a/drivers/net/arcnet/com20020.c
+++ b/drivers/net/arcnet/com20020.c
@@ -238,15 +238,15 @@ static int com20020_reset(struct net_device *dev, int really_reset)
         u_char inbyte;
 
         BUGMSG(D_DEBUG, "%s: %d: %s: dev: %p, lp: %p, dev->name: %s\n",
-                __FILE__,__LINE__,__FUNCTION__,dev,lp,dev->name);
+                __FILE__,__LINE__,__func__,dev,lp,dev->name);
         BUGMSG(D_INIT, "Resetting %s (status=%02Xh)\n",
                dev->name, ASTATUS());
 
-        BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);
+        BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);
         lp->config = TXENcfg | (lp->timeout << 3) | (lp->backplane << 2);
         /* power-up defaults */
         SETCONF;
-        BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);
+        BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);
 
         if (really_reset) {
                 /* reset the card */
@@ -254,22 +254,22 @@ static int com20020_reset(struct net_device *dev, int really_reset)
                 mdelay(RESETtime * 2);  /* COM20020 seems to be slower sometimes */
         }
         /* clear flags & end reset */
-        BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);
+        BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);
         ACOMMAND(CFLAGScmd | RESETclear | CONFIGclear);
 
         /* verify that the ARCnet signature byte is present */
-        BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);
+        BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);
 
         com20020_copy_from_card(dev, 0, 0, &inbyte, 1);
-        BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);
+        BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);
         if (inbyte != TESTvalue) {
-                BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);
+                BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);
                 BUGMSG(D_NORMAL, "reset failed: TESTvalue not present.\n");
                 return 1;
         }
         /* enable extended (512-byte) packets */
         ACOMMAND(CONFIGcmd | EXTconf);
-        BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);
+        BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);
 
         /* done!  return success. */
         return 0;