diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-06-11 22:17:42 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-06-11 22:17:42 +0200 |
| commit | 32d4e38eeb5bcc2f854787bfa68bea2b55eaa1d7 (patch) | |
| tree | 35b56ce4860d33a3b75358251c6e4e4e7bdb38f9 /drivers/net/inca-ip_sw.c | |
| parent | 1730edf76c54381475e2da11f75b1ce563c4e62c (diff) | |
| parent | 3b904ccb93c3196727e2e9870cb1df903cab19ad (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-net
Diffstat (limited to 'drivers/net/inca-ip_sw.c')
| -rw-r--r-- | drivers/net/inca-ip_sw.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/inca-ip_sw.c b/drivers/net/inca-ip_sw.c index e4aaed6afb..ffdd1f3f37 100644 --- a/drivers/net/inca-ip_sw.c +++ b/drivers/net/inca-ip_sw.c @@ -26,9 +26,6 @@ #include <common.h> -#if defined(CONFIG_CMD_NET) \ - && defined(CONFIG_NET_MULTI) && defined(CONFIG_INCA_IP_SWITCH) - #include <malloc.h> #include <net.h> #include <asm/inca-ip.h> @@ -813,5 +810,3 @@ Fail: return -1; } #endif /* CONFIG_INCA_IP_SWITCH_AMDIX */ - -#endif |