Merge branch 'master' of git://git.denx.de/u-boot-arm

[platform/kernel/u-boot.git] / board / pcippc2 / pcippc2.c

diff --git a/board/pcippc2/pcippc2.c b/board/pcippc2/pcippc2.c
index a3dbdc8..6ee44d6 100644 (file)
--- a/board/pcippc2/pcippc2.c
+++ b/board/pcippc2/pcippc2.c
@@ -147,10 +147,12 @@ void pci_init_board (void)
        cpc710_pci_enable_timeout ();
 }
 
+#ifdef CONFIG_CMD_DOC
 void doc_init (void)
 {
        doc_probe (pcippc2_fpga1_phys + HW_FPGA1_DOC);
 }
+#endif
 
 void pcippc2_cpci3264_init (void)
 {
@@ -230,16 +232,16 @@ int do_wd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        default:
                break;
        }
-       printf ("Usage:\n%s\n", cmdtp->usage);
+       cmd_usage(cmdtp);
        return 1;
 }
 
 U_BOOT_CMD(
        wd,     2,      1,      do_wd,
-       "wd      - check and set watchdog\n",
+       "check and set watchdog",
        "on   - switch watchDog on\n"
        "wd off  - switch watchdog off\n"
-       "wd      - print current status\n"
+       "wd      - print current status"
 );
 
 #endif