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/dc2114x.c | |
| parent | 1730edf76c54381475e2da11f75b1ce563c4e62c (diff) | |
| parent | 3b904ccb93c3196727e2e9870cb1df903cab19ad (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-net
Diffstat (limited to 'drivers/net/dc2114x.c')
| -rw-r--r-- | drivers/net/dc2114x.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c index 1d728d8b30..811723904d 100644 --- a/drivers/net/dc2114x.c +++ b/drivers/net/dc2114x.c @@ -19,10 +19,6 @@ */ #include <common.h> - -#if defined(CONFIG_CMD_NET) \ - && defined(CONFIG_NET_MULTI) && defined(CONFIG_TULIP) - #include <malloc.h> #include <net.h> #include <pci.h> @@ -766,5 +762,3 @@ static void update_srom(struct eth_device *dev, bd_t *bis) } } #endif /* UPDATE_SROM */ - -#endif |