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 /home/git/u-boot
[oweals/u-boot.git]
/
board
/
BuS
/
EB+MCF-EV123
/
mii.c
diff --git
a/board/BuS/EB+MCF-EV123/mii.c
b/board/BuS/EB+MCF-EV123/mii.c
index ebd3ed938747a5a633120c20ff8efc1bc03bba40..3ea20a6109ee18362de3359eedeacef317fb30a6 100644
(file)
--- a/
board/BuS/EB+MCF-EV123/mii.c
+++ b/
board/BuS/EB+MCF-EV123/mii.c
@@
-132,7
+132,7
@@
uint mii_send(uint mii_cmd)
return (mii_reply & 0xffff); /* data read from phy */
}
-#endif /* CFG_DISCOVER_PHY ||
(CONFIG_COMMANDS & CONFIG_CMD_MII)
*/
+#endif /* CFG_DISCOVER_PHY ||
CONFIG_CMD_MII
*/
#if defined(CFG_DISCOVER_PHY)
int mii_discover_phy(struct eth_device *dev)