diff options
| author | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2007-08-13 16:34:33 +0200 |
|---|---|---|
| committer | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2007-08-13 16:34:33 +0200 |
| commit | 375c2c9e57ea5b8d678475379378f4774aa9cb88 (patch) | |
| tree | c8499eaec089c8fe7c9eda562131f45b4a7738c6 /net/tftp.c | |
| parent | f0d1246ed7cb5a88522244c596d7ae7e6f161283 (diff) | |
| parent | 9986bc3e40e899bea372a99a2bca4071bdf2e24b (diff) | |
| download | olio-uboot-2014.01-375c2c9e57ea5b8d678475379378f4774aa9cb88.tar.xz olio-uboot-2014.01-375c2c9e57ea5b8d678475379378f4774aa9cb88.zip | |
Merge commit 'upstream/master'
Diffstat (limited to 'net/tftp.c')
| -rw-r--r-- | net/tftp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tftp.c b/net/tftp.c index f3a547148..d56e30b5b 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -12,7 +12,7 @@ #undef ET_DEBUG -#if (CONFIG_COMMANDS & CFG_CMD_NET) +#if defined(CONFIG_CMD_NET) #define WELL_KNOWN_PORT 69 /* Well known TFTP port # */ #define TIMEOUT 5 /* Seconds to timeout for a lost pkt */ @@ -386,4 +386,4 @@ TftpStart (void) TftpSend (); } -#endif /* CFG_CMD_NET */ +#endif |