commit 36301de10e4e9129f05298f0d8c7961fc8f539d8
author Jon Loeliger <jdl@jdl.com> Mon Jun 11 19:02:49 2007 -0500
committer Wolfgang Denk <wd@denx.de> Wed Jul 04 00:23:14 2007 +0200
tree 0e172685b76a40bf48460793dec4f67c55768115
parent e6e4e906f725412de5f83e718a89574eab3796d3

net/: Augment CONFIG_COMMANDS tests with defined(CONFIG_CMD_*).

This is a compatibility step that allows both the older form
and the new form to co-exist for a while until the older can
be removed entirely.

All transformations are of the form:
Before:
    #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT)
After:
    #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) || defined(CONFIG_CMD_AUTOSCRIPT)

Signed-off-by: Jon Loeliger <jdl@freescale.com>

net/tftp.c

diff --git a/net/tftp.c b/net/tftp.c
index f3a5471..c4266eb 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -12,7 +12,7 @@
 
 #undef	ET_DEBUG
 
-#if (CONFIG_COMMANDS & CFG_CMD_NET)
+#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
 
 #define WELL_KNOWN_PORT	69		/* Well known TFTP port #		*/
 #define TIMEOUT		5		/* Seconds to timeout for a lost pkt	*/