From c502dfca381fefc85a33684fcbf70abc77b90ff8 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Wed, 4 Jan 2012 08:59:38 +0000
Subject: [PATCH] --- yaml --- r: 279421 b: refs/heads/master c:
 48529680dc59061eaa13ea3b1047401612b79600 h: refs/heads/master i:   279419:
 755a5f32747ca934945e02c4834faec9825ac906 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/net/ethernet/rdc/r6040.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 4428870b90a7..4b8b9e5f8bc7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 853d5dc95b41babb7001934becad9c944738d8e3
+refs/heads/master: 48529680dc59061eaa13ea3b1047401612b79600
diff --git a/trunk/drivers/net/ethernet/rdc/r6040.c b/trunk/drivers/net/ethernet/rdc/r6040.c
index b8dc7276adac..87aa43935070 100644
--- a/trunk/drivers/net/ethernet/rdc/r6040.c
+++ b/trunk/drivers/net/ethernet/rdc/r6040.c
@@ -735,9 +735,10 @@ static void r6040_mac_address(struct net_device *dev)
 	void __iomem *ioaddr = lp->base;
 	u16 *adrp;
 
-	/* MAC operation register */
-	iowrite16(MAC_RST, ioaddr + MCR1); /* Reset MAC */
-	iowrite16(MAC_SM_RST, ioaddr + MAC_SM); /* Reset internal state machine */
+	/* Reset MAC */
+	iowrite16(MAC_RST, ioaddr + MCR1);
+	/* Reset internal state machine */
+	iowrite16(MAC_SM_RST, ioaddr + MAC_SM);
 	iowrite16(0, ioaddr + MAC_SM);
 	mdelay(5);