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/bootp.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/bootp.c')
| -rw-r--r-- | net/bootp.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/bootp.c b/net/bootp.c index 3093852..e679f8b 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -20,8 +20,6 @@ #define BOOTP_VENDOR_MAGIC 0x63825363 /* RFC1048 Magic Cookie */ -#if defined(CONFIG_CMD_NET) - #define TIMEOUT 5000UL /* Milliseconds before trying BOOTP again */ #ifndef CONFIG_NET_RETRY_COUNT # define TIMEOUT_COUNT 5 /* # of timeouts before giving up */ @@ -948,5 +946,3 @@ void DhcpRequest(void) BootpRequest(); } #endif /* CONFIG_CMD_DHCP */ - -#endif /* CONFIG_CMD_NET */ |