projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-usb
[oweals/u-boot.git]
/
drivers
/
net
/
s3c4510b_eth.c
diff --git
a/drivers/net/s3c4510b_eth.c
b/drivers/net/s3c4510b_eth.c
index 6dcb244861b6210c4a45c93e6888a7c2143ad734..818ed3d34f6413b158a8cccd811040797570f6b0 100644
(file)
--- a/
drivers/net/s3c4510b_eth.c
+++ b/
drivers/net/s3c4510b_eth.c
@@
-100,7
+100,7
@@
int eth_init(bd_t *bis)
ETH *eth = &m_eth;
/* store our MAC address */
- eth
->m_mac = bis->bi_enetaddr
;
+ eth
_getenv_enetaddr("ethaddr", eth->m_mac)
;
/* setup DBMA and MAC */
PUT_REG( REG_BDMARXCON, ETH_BRxRS); /* reset BDMA RX machine */