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 commit 'wd/master'
[oweals/u-boot.git]
/
drivers
/
net
/
rtl8139.c
diff --git
a/drivers/net/rtl8139.c
b/drivers/net/rtl8139.c
index 097f6841aeeeaa6d018ed737f55a7f7d9283a5f8..4fd20ac4fe1efed50b177d7bc6e95002fdab41b8 100644
(file)
--- a/
drivers/net/rtl8139.c
+++ b/
drivers/net/rtl8139.c
@@
-77,9
+77,6
@@
#include <asm/io.h>
#include <pci.h>
-#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI) && \
- defined(CONFIG_RTL8139)
-
#define RTL_TIMEOUT 100000
#define ETH_FRAME_LEN 1514
@@
-545,4
+542,3
@@
static void rtl_disable(struct eth_device *dev)
udelay (100); /* wait 100us */
}
}
-#endif