diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-12-17 22:59:27 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-12-17 22:59:27 +0100 |
| commit | b6535daefd65c93ea429bc4728062379dda6e482 (patch) | |
| tree | 2ba6d227112143d5e522a2aca72a85671e08bd55 /net/net.c | |
| parent | e5e4e705ce402856a4800ebf4c0cc163d41b58b0 (diff) | |
| parent | 1ab70f6fff9fa3b7910c11b874f625e004256c50 (diff) | |
| download | u-boot-imx-b6535daefd65c93ea429bc4728062379dda6e482.zip u-boot-imx-b6535daefd65c93ea429bc4728062379dda6e482.tar.gz u-boot-imx-b6535daefd65c93ea429bc4728062379dda6e482.tar.bz2 | |
Merge branch 'next' of git://git.denx.de/u-boot-net
Diffstat (limited to 'net/net.c')
| -rw-r--r-- | net/net.c | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -96,8 +96,6 @@ #include "dns.h" #endif -#if defined(CONFIG_CMD_NET) - DECLARE_GLOBAL_DATA_PTR; #ifndef CONFIG_ARP_TIMEOUT @@ -1872,8 +1870,6 @@ void copy_filename (char *dst, char *src, int size) *dst = '\0'; } -#endif - #if defined(CONFIG_CMD_NFS) || defined(CONFIG_CMD_SNTP) || defined(CONFIG_CMD_DNS) /* * make port a little random, but use something trivial to compute |