summaryrefslogtreecommitdiff
path: root/drivers/net/uli526x.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-06-11 22:17:42 +0200
committerWolfgang Denk <wd@denx.de>2008-06-11 22:17:42 +0200
commit32d4e38eeb5bcc2f854787bfa68bea2b55eaa1d7 (patch)
tree35b56ce4860d33a3b75358251c6e4e4e7bdb38f9 /drivers/net/uli526x.c
parent1730edf76c54381475e2da11f75b1ce563c4e62c (diff)
parent3b904ccb93c3196727e2e9870cb1df903cab19ad (diff)
downloadu-boot-imx-32d4e38eeb5bcc2f854787bfa68bea2b55eaa1d7.zip
u-boot-imx-32d4e38eeb5bcc2f854787bfa68bea2b55eaa1d7.tar.gz
u-boot-imx-32d4e38eeb5bcc2f854787bfa68bea2b55eaa1d7.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot-net
Diffstat (limited to 'drivers/net/uli526x.c')
-rw-r--r--drivers/net/uli526x.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/uli526x.c b/drivers/net/uli526x.c
index 79d29ae..7145b72 100644
--- a/drivers/net/uli526x.c
+++ b/drivers/net/uli526x.c
@@ -22,9 +22,6 @@
/* some kernel function compatible define */
-#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI) && \
- defined(CONFIG_ULI526X)
-
#undef DEBUG
/* Board/System/Debug information/definition */
@@ -993,4 +990,3 @@ static void set_mac_addr(struct eth_device *dev)
udelay(10);
return;
}
-#endif