diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2007-11-20 08:19:56 -0700 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2007-11-20 08:19:56 -0700 |
commit | f92edbd8a0ef16a2b9127cbb564c09685728e4b0 (patch) | |
tree | ae33aacff092561e2c64eabc11a8adc5e2acea6b /net/tftp.c | |
parent | efe33035acd5f7c13963a4d52e5aac1b68612ae4 (diff) | |
parent | 9a337ddc154a10a26f117fd147b009abcdeba75a (diff) | |
download | u-boot-imx-f92edbd8a0ef16a2b9127cbb564c09685728e4b0.zip u-boot-imx-f92edbd8a0ef16a2b9127cbb564c09685728e4b0.tar.gz u-boot-imx-f92edbd8a0ef16a2b9127cbb564c09685728e4b0.tar.bz2 |
Merge branch 'origin' into kconfig-for-1.3.1
Diffstat (limited to 'net/tftp.c')
-rw-r--r-- | net/tftp.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -15,7 +15,7 @@ #if defined(CONFIG_CMD_NET) #define WELL_KNOWN_PORT 69 /* Well known TFTP port # */ -#define TIMEOUT 5 /* Seconds to timeout for a lost pkt */ +#define TIMEOUT 5UL /* Seconds to timeout for a lost pkt */ #ifndef CONFIG_NET_RETRY_COUNT # define TIMEOUT_COUNT 10 /* # of timeouts before giving up */ #else |