Merge with /home/wd/git/u-boot/custodian/u-boot-ppc4xx

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

diff --git a/common/cmd_console.c b/common/cmd_console.c
index e6b001a15a7d2dd0f4c7a4eab1fedaab07ad050b..5e0f990723b371c013fe315af27811db812fc2e4 100644 (file)
--- a/common/cmd_console.c
+++ b/common/cmd_console.c
@@ -28,7 +28,7 @@
 #include <command.h>
 #include <devices.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_CONSOLE)
+#if defined(CONFIG_CMD_CONSOLE)
 
 extern void _do_coninfo (void);
 int do_coninfo (cmd_tbl_t * cmd, int flag, int argc, char *argv[])
@@ -37,7 +37,7 @@ int do_coninfo (cmd_tbl_t * cmd, int flag, int argc, char *argv[])
 
        /* Scan for valid output and input devices */
 
-       printf ("List of available devices:\n");
+       puts ("List of available devices:\n");
 
        for (i = 1; i <= ListNumItems (devlist); i++) {
                device_t *dev = ListGetPtrToItem (devlist, i);
@@ -62,10 +62,10 @@ int do_coninfo (cmd_tbl_t * cmd, int flag, int argc, char *argv[])
 
 /***************************************************/
 
-cmd_tbl_t U_BOOT_CMD(CONINFO) = MK_CMD_ENTRY(
-       "coninfo",      3,      1,      do_coninfo,
-       "coninfo - print console devices and informations\n",
+U_BOOT_CMD(
+       coninfo,        3,      1,      do_coninfo,
+       "coninfo - print console devices and information\n",
        ""
 );
 
-#endif /* CFG_CMD_CONSOLE */
+#endif