git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
net
/
fec.c
diff --git
a/drivers/net/fec.c
b/drivers/net/fec.c
index
47da519
..
42d9ac9
100644
(file)
--- a/
drivers/net/fec.c
+++ b/
drivers/net/fec.c
@@
-1031,7
+1031,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;
}