summaryrefslogtreecommitdiff
path: root/drivers/net/tigon3.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/tigon3.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/tigon3.c')
-rw-r--r--drivers/net/tigon3.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/tigon3.c b/drivers/net/tigon3.c
index 5f6a4ec..ab448b0 100644
--- a/drivers/net/tigon3.c
+++ b/drivers/net/tigon3.c
@@ -12,8 +12,7 @@
/******************************************************************************/
#include <common.h>
#include <asm/types.h>
-#if defined(CONFIG_CMD_NET) && !defined(CONFIG_NET_MULTI) && \
- defined(CONFIG_TIGON3)
+
#ifdef CONFIG_BMW
#include <mpc824x.h>
#endif
@@ -5695,5 +5694,3 @@ LM_DmaTest (PLM_DEVICE_BLOCK pDevice, PLM_UINT8 pBufferVirt,
}
return LM_STATUS_SUCCESS;
}
-
-#endif