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 with /home/wd/git/u-boot/custodian/u-boot-mpc85xx
[oweals/u-boot.git]
/
drivers
/
bcm570x.c
diff --git
a/drivers/bcm570x.c
b/drivers/bcm570x.c
index 5a3ec22df024f33e0b4dcf960e2b8c703fd89159..703cda4865318ddfa35ad56730c1d7c3d053e7a2 100644
(file)
--- a/
drivers/bcm570x.c
+++ b/
drivers/bcm570x.c
@@
-6,7
+6,7
@@
#include <common.h>
#include <common.h>
-#if
((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
) \
+#if
defined(CONFIG_CMD_NET
) \
&& (!defined(CONFIG_NET_MULTI)) && defined(CONFIG_BCM570x)
#ifdef CONFIG_BMW
&& (!defined(CONFIG_NET_MULTI)) && defined(CONFIG_BCM570x)
#ifdef CONFIG_BMW
@@
-1688,4
+1688,4
@@
QQ_GetTail(
return pQueue->Array[Idx];
}
return pQueue->Array[Idx];
}
-#endif
/* CFG_CMD_NET, !CONFIG_NET_MULTI, CONFIG_BCM570x */
+#endif