summaryrefslogtreecommitdiff
path: root/drivers/net/pcnet.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/pcnet.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/pcnet.c')
-rw-r--r--drivers/net/pcnet.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c
index aa04e8f..a4f0214 100644
--- a/drivers/net/pcnet.c
+++ b/drivers/net/pcnet.c
@@ -45,9 +45,6 @@
#define PCNET_DEBUG2(fmt,args...)
#endif
-#if defined(CONFIG_CMD_NET) \
- && defined(CONFIG_NET_MULTI) && defined(CONFIG_PCNET)
-
#if !defined(CONF_PCNET_79C973) && defined(CONF_PCNET_79C975)
#error "Macro for PCnet chip version is not defined!"
#endif
@@ -537,4 +534,3 @@ static void pcnet_halt (struct eth_device *dev)
printf ("%s: TIMEOUT: controller reset failed\n", dev->name);
}
}
-#endif