diff options
author | Andy Fleming <afleming@freescale.com> | 2007-08-03 02:23:23 -0500 |
---|---|---|
committer | Andrew Fleming-AFLEMING <afleming@freescale.com> | 2007-08-03 02:23:23 -0500 |
commit | 6bf6f114dcdd97ec3f80c2761ed40e31229d6b78 (patch) | |
tree | 4bc9e1362c3090bb6d2df71109228ca61b8d00ce /net/tftp.c | |
parent | 5a56af3b522ba47fb33a3fee84d23bf1e5429654 (diff) | |
parent | 5dc210dec5bace98a50b6ba905347890091a9bb0 (diff) |
Merge branch 'testing' into working
Conflicts:
CHANGELOG
fs/fat/fat.c
include/configs/MPC8560ADS.h
include/configs/pcs440ep.h
net/eth.c
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 f3a54714838..d56e30b5b5c 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 |