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; }