commit | f2302d4430e7f3f48308d6a585320fe96af8afbd | [log] [tgz] |
---|---|---|
author | Stefan Roese <sr@denx.de> | Wed Aug 06 14:05:38 2008 +0200 |
committer | Stefan Roese <sr@denx.de> | Wed Aug 06 14:05:38 2008 +0200 |
tree | eec529fa883a32b0bd44f65aa46a454dc5c69688 | |
parent | 9246f5ecfd353ae297a02ffd5328402acf16c9dd [diff] [blame] |
Fix merge problems Signed-off-by: Stefan Roese <sr@denx.de>
diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c index caa467d..24ff9b9 100644 --- a/common/cmd_bdinfo.c +++ b/common/cmd_bdinfo.c
@@ -205,7 +205,7 @@ 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; }