summaryrefslogtreecommitdiff
path: root/net/tftp.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2007-08-06 01:11:08 +0200
committerWolfgang Denk <wd@denx.de>2007-08-06 01:11:08 +0200
commitf2c2a937d8c4a44f63ff88bf82023e03a29497a2 (patch)
treefa8f7c9fb65d10259e76c40c52cf8277947424d4 /net/tftp.c
parentb1b54e352028ed370c3aa95d6fdeb9d64c5d2f86 (diff)
parent5728be389e65fd47f34b33c2596271eb4db751ae (diff)
downloadolio-uboot-2014.01-f2c2a937d8c4a44f63ff88bf82023e03a29497a2.tar.xz
olio-uboot-2014.01-f2c2a937d8c4a44f63ff88bf82023e03a29497a2.zip
Merge with /home/wd/git/u-boot/custodian/u-boot-testing
Diffstat (limited to 'net/tftp.c')
-rw-r--r--net/tftp.c4
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