Merge ../custodians

diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c
index d05998366b150e82f6200f249c017c2c989c052d..c28a155453099fda3e5d7ca4ab232f89a87527d3 100644 (file)
--- a/common/cmd_bdinfo.c
+++ b/common/cmd_bdinfo.c
@@ -152,7 +152,9 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
+#if defined(CONFIG_CMD_NET)
        int i;
+#endif
        bd_t *bd = gd->bd;
 
        print_num ("mem start",         (ulong)bd->bi_memstart);