Merge branch 'mimc200' into next

[u-boot] / board / mpl / pati / cmd_pati.c

diff --git a/board/mpl/pati/cmd_pati.c b/board/mpl/pati/cmd_pati.c
index cdab2865785c89fce52be62cdc3cc64f8f9e151d..95bfdcc8c8e2a74bd32d842aeec874dd66a79e4b 100644 (file)
--- a/board/mpl/pati/cmd_pati.c
+++ b/board/mpl/pati/cmd_pati.c
@@ -37,7 +37,7 @@ extern void user_led0(int led_on);
 extern void user_led1(int led_on);
 
 /* ------------------------------------------------------------------------- */
-#if defined(CFG_PCI_CON_DEVICE)
+#if defined(CONFIG_SYS_PCI_CON_DEVICE)
 extern void pci_con_disc(void);
 extern void pci_con_connect(void);
 #endif
@@ -296,8 +296,6 @@ static int pati_pci_eeprom_read(unsigned short offset, unsigned long addr, unsig
        return 0;
 }
 
-
-
 /******************************************************************************
  * PCI Bridge Registers Dump
 *******************************************************************************/
@@ -362,12 +360,12 @@ int do_pati(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        if (strcmp(argv[1], "info") == 0)
        {
                show_pld_regs();
-               return 0;
+               return 0;
        }
        if (strcmp(argv[1], "pci") == 0)
        {
                display_pci_regs();
-               return 0;
+               return 0;
        }
        if (strcmp(argv[1], "led") == 0)
        {
@@ -379,8 +377,8 @@ int do_pati(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                else
                        user_led1(led_on);
                return 0;
-       }
-#if defined(CFG_PCI_CON_DEVICE)
+       }
+#if defined(CONFIG_SYS_PCI_CON_DEVICE)
        if (strcmp(argv[1], "con") == 0) {
                pci_con_connect();
                return 0;
@@ -429,7 +427,7 @@ int do_pati(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        pati,   8,      1,      do_pati,
-       "pati    - PATI specific Cmds\n",
+       "PATI specific Cmds",
        "info - displays board information\n"
        "pati pci  - displays PCI registers\n"
        "pati led <nr> <on> \n"