summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2007-08-15 21:11:45 +0200
committerStefan Roese <sr@denx.de>2007-08-15 21:11:45 +0200
commita44e7a97c8cbbac3cbc32376dcaad0ec1f76f604 (patch)
tree5be8f0f835b6ca59ca296ef9b76563175782e1ea /net
parentb706d63559aeec352bc72dd86d7d5423c15f6a60 (diff)
parented4058afc85dc6341fea38cb240beb76296b0d24 (diff)
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 888ec987cf..d6db91c058 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