projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge with git://www.denx.de/git/u-boot.git
[platform/kernel/u-boot.git]
/
cpu
/
ixp
/
npe
/
npe.c
diff --git
a/cpu/ixp/npe/npe.c
b/cpu/ixp/npe/npe.c
index
ab7ca8b
..
7e4af44
100644
(file)
--- a/
cpu/ixp/npe/npe.c
+++ b/
cpu/ixp/npe/npe.c
@@
-682,7
+682,7
@@
int npe_initialize(bd_t * bis)
eth_register(dev);
-#if defined(CONFIG_MII) ||
(CONFIG_COMMANDS & CF
G_CMD_MII)
+#if defined(CONFIG_MII) ||
defined(CONFI
G_CMD_MII)
miiphy_register(dev->name, npe_miiphy_read, npe_miiphy_write);
#endif