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 git://www.denx.de/git/u-boot
[oweals/u-boot.git]
/
common
/
cmd_mii.c
diff --git
a/common/cmd_mii.c
b/common/cmd_mii.c
index e6595360cbeca81a3fe144ee18ad7ae0e8d6bb0e..72e11d54425097d4eec8e790597803a3aa42be8c 100644
(file)
--- a/
common/cmd_mii.c
+++ b/
common/cmd_mii.c
@@
-28,7
+28,7
@@
#include <common.h>
#include <command.h>
#include <common.h>
#include <command.h>
-#if
(CONFIG_COMMANDS & CF
G_CMD_MII)
+#if
defined(CONFI
G_CMD_MII)
#include <miiphy.h>
#ifdef CONFIG_TERSE_MII
#include <miiphy.h>
#ifdef CONFIG_TERSE_MII
@@
-438,7
+438,7
@@
int do_mii (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
int rcode = 0;
char *devname;
int rcode = 0;
char *devname;
-#if
def CONFIG_8xx
+#if
defined(CONFIG_8xx) || defined(CONFIG_MCF532x)
mii_init ();
#endif
mii_init ();
#endif
@@
-595,4
+595,4
@@
U_BOOT_CMD(
#endif /* CONFIG_TERSE_MII */
#endif /* CONFIG_TERSE_MII */
-#endif
/* CFG_CMD_MII */
+#endif