Merge branch 'bjorn-pci-root-v4-2.6.35' into release

[mv-sheeva.git] / drivers / net / fec.c

diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index 9f98c1c4a344e21cc558e090ee3e2be313ccd8c5..9b4e8f797a7ad76d7ae8c36b8efe5d08a94f530d 100644 (file)
--- a/drivers/net/fec.c
+++ b/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;
 }