projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ixp/interrupts: Move conditional compilation to Makefile
[oweals/u-boot.git]
/
cpu
/
mpc8220
/
fec.c
diff --git
a/cpu/mpc8220/fec.c
b/cpu/mpc8220/fec.c
index 1201e794df4a5fe7330026e82342744a60e102f9..992e0ffbc4666922e29ef795cf19b808bb674b24 100644
(file)
--- a/
cpu/mpc8220/fec.c
+++ b/
cpu/mpc8220/fec.c
@@
-15,10
+15,10
@@
#include "fec.h"
#undef DEBUG
#include "fec.h"
#undef DEBUG
-#if
(CONFIG_COMMANDS & CF
G_CMD_NET) && defined(CONFIG_NET_MULTI) && \
+#if
defined(CONFI
G_CMD_NET) && defined(CONFIG_NET_MULTI) && \
defined(CONFIG_MPC8220_FEC)
defined(CONFIG_MPC8220_FEC)
-#if !(defined(CONFIG_MII) ||
(CONFIG_COMMANDS & CF
G_CMD_MII))
+#if !(defined(CONFIG_MII) ||
defined(CONFI
G_CMD_MII))
#error "CONFIG_MII has to be defined!"
#endif
#error "CONFIG_MII has to be defined!"
#endif
@@
-847,7
+847,7
@@
int mpc8220_fec_initialize (bd_t * bis)
sprintf (dev->name, "FEC ETHERNET");
eth_register (dev);
sprintf (dev->name, "FEC ETHERNET");
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,
fec8220_miiphy_read, fec8220_miiphy_write);
#endif
miiphy_register (dev->name,
fec8220_miiphy_read, fec8220_miiphy_write);
#endif