---

yaml --- r: 190615 b: refs/heads/master c: 7cff094 h: refs/heads/master i: 190613: dbefeb3 190611: d208320 190607: 0c78922 v: v3
git-mirror · May 5, 2010 · 561c9c6 · 561c9c6
1 parent 718750f
commit 561c9c6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f935aa9e99d6ec74a50871c120e6b21de7256efb
+refs/heads/master: 7cff0943a1104479fc9fc2d6ced24c02ba81e73e
diff --git a/trunk/drivers/net/fec.c b/trunk/drivers/net/fec.c
@@ -1653,7 +1653,7 @@ fec_set_mac_address(struct net_device *dev, void *p)
 		(dev->dev_addr[1] << 16) | (dev->dev_addr[0] << 24),
 		fep->hwp + FEC_ADDR_LOW);
 	writel((dev->dev_addr[5] << 16) | (dev->dev_addr[4] << 24),
-		fep + FEC_ADDR_HIGH);
+		fep->hwp + FEC_ADDR_HIGH);
 	return 0;
 }