summaryrefslogtreecommitdiffstats
path: root/common/cmd_bdinfo.c
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2007-12-11 11:34:54 +0100
committerStefan Roese <sr@denx.de>2007-12-11 11:34:54 +0100
commit9caeaadf508cd0e11ac5dfc56ab0f72e3b89a105 (patch)
tree1afcc9c20c04e19870ab5e2996104877695c54a3 /common/cmd_bdinfo.c
parent7cfc12a7dcfdb350e2ab76db4dafcc30f7e77c2b (diff)
parent41be969f4957115ed7b1fe8b890bfaee99d7a7a2 (diff)
downloadblackbird-obmc-uboot-9caeaadf508cd0e11ac5dfc56ab0f72e3b89a105.tar.gz
blackbird-obmc-uboot-9caeaadf508cd0e11ac5dfc56ab0f72e3b89a105.zip
Merge commit 'u-boot/master' into for-1.3.1
Conflicts: drivers/rtc/Makefile
Diffstat (limited to 'common/cmd_bdinfo.c')
-rw-r--r--common/cmd_bdinfo.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c
index ef15a006cd..d05998366b 100644
--- a/common/cmd_bdinfo.c
+++ b/common/cmd_bdinfo.c
@@ -30,7 +30,6 @@
DECLARE_GLOBAL_DATA_PTR;
-#if defined(CONFIG_CMD_BDI)
static void print_num(const char *, ulong);
#ifndef CONFIG_ARM /* PowerPC and other */
@@ -350,4 +349,3 @@ U_BOOT_CMD(
"bdinfo - print Board Info structure\n",
NULL
);
-#endif
OpenPOWER on IntegriCloud