Fix merge problems

[karo-tx-uboot.git] / common / cmd_bdinfo.c

diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c
index caa467d02681f86fefadbb7c6c7a02e74ded0c59..24ff9b9956eff07f77b9435f263f26297f81a2ec 100644 (file)
--- a/common/cmd_bdinfo.c
+++ b/common/cmd_bdinfo.c
@@ -205,7 +205,7 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        puts ("\nip_addr     = ");
        print_IPaddr (bd->bi_ip_addr);
 #endif
-       printf ("\nbaudrate    = %d bps\n", (ulong)bd->bi_baudrate);
+       printf ("\nbaudrate    = %ld bps\n", (ulong)bd->bi_baudrate);
        return 0;
 }