summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2007-08-16 09:21:48 +0200
committerStefan Roese <sr@denx.de>2007-08-16 09:21:48 +0200
commitf31b0aecb5435143ac1cd5cf2abab1f9ef6ba8ea (patch)
treee41e5d1b64c49fae1de0b6bba62febaba05748cc /net
parent0e19209767194a97cec6d93dba9e64d1da8d548e (diff)
parented4058afc85dc6341fea38cb240beb76296b0d24 (diff)
downloadu-boot-imx-f31b0aecb5435143ac1cd5cf2abab1f9ef6ba8ea.zip
u-boot-imx-f31b0aecb5435143ac1cd5cf2abab1f9ef6ba8ea.tar.gz
u-boot-imx-f31b0aecb5435143ac1cd5cf2abab1f9ef6ba8ea.tar.bz2
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'net')
-rw-r--r--net/tftp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tftp.c b/net/tftp.c
index 888ec98..d6db91c 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -614,4 +614,4 @@ static void parse_multicast_oack(char *pkt, int len)
#endif /* Multicast TFTP */
-#endif /* CFG_CMD_NET */
+#endif