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-mpc83xx
[oweals/u-boot.git]
/
drivers
/
e1000.c
diff --git
a/drivers/e1000.c
b/drivers/e1000.c
index 1ba766019df0c383019b8ecf635ed3e4941d4a19..f0741da82b29b49bc054b0d8b34a4798bc6131e4 100644
(file)
--- a/
drivers/e1000.c
+++ b/
drivers/e1000.c
@@
-44,7
+44,7
@@
tested on both gig copper and gig fiber boards
#include "e1000.h"
-#if
((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
) \
+#if
defined(CONFIG_CMD_NET
) \
&& defined(CONFIG_NET_MULTI) && defined(CONFIG_E1000)
#define TOUT_LOOP 100000