Merge branch 'cleanups' into next

[u-boot] / board / esd / ocrtc / cmd_ocrtc.c

diff --git a/board/esd/ocrtc/cmd_ocrtc.c b/board/esd/ocrtc/cmd_ocrtc.c
index ffbb4adddcd5e9ae4a1daa0d5f90a19748dffd6d..db2c5484210a6c4df6e3a2d7da0ffb2a4a6f4bd6 100644 (file)
--- a/board/esd/ocrtc/cmd_ocrtc.c
+++ b/board/esd/ocrtc/cmd_ocrtc.c
@@ -25,10 +25,10 @@
 #include <command.h>
 #include <pci.h>
 #include <pci_ids.h>
-#include <405gp_pci.h>
+#include <asm/4xx_pci.h>
 
 
-#if (CONFIG_COMMANDS & CFG_CMD_BSP)
+#if defined(CONFIG_CMD_BSP)
 
 /*
  * Set device number on pci board
@@ -54,7 +54,7 @@ int do_setdevice(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 U_BOOT_CMD(
        setdevice,      1,      1,      do_setdevice,
-       "setdevice - Set device number on pci adapter boards\n",
+       "Set device number on pci adapter boards",
        NULL
 );
 
@@ -77,7 +77,7 @@ int do_getdevice(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 U_BOOT_CMD(
        getdevice,      1,      1,      do_getdevice,
-       "getdevice - Get device number and set slot env variable\n",
+       "Get device number and set slot env variable",
        NULL
 );