From 561c9c6991dd365750b02b6b4283fe727f33a850 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20Walstr=C3=B6m?= <mattias@vmlinux.org>
Date: Wed, 5 May 2010 00:55:48 -0700
Subject: [PATCH] --- yaml --- r: 190615 b: refs/heads/master c:
 7cff0943a1104479fc9fc2d6ced24c02ba81e73e h: refs/heads/master i:   190613:
 dbefeb366e1c8ad9b593501fd734dc595d3cfa33   190611:
 d208320a2cc54643f4c226c9572c0258c81cff7a   190607:
 0c78922b8f87fac06d4e9b0c3dde8b3531a11a2c v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/fec.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 29be69e44866..1dbe9779ef63 100644
--- 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
index 9f98c1c4a344..9b4e8f797a7a 100644
--- 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;
 }