Merge branch 'next' of ../next

[u-boot] / board / delta / delta.c

diff --git a/board/delta/delta.c b/board/delta/delta.c
index 6e227748b0168bbc687fa07ba2bf86a6a2bb6b8f..73e6c3e37478de30101d5db659bde9c2fc67bbc2 100644 (file)
--- a/board/delta/delta.c
+++ b/board/delta/delta.c
@@ -259,7 +259,7 @@ int do_kbd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
           kbd, 1,      1,      do_kbd,
-          "kbd     - read keyboard status\n",
+          "read keyboard status",
           NULL
 );
 
@@ -304,8 +304,8 @@ static void init_DA9030()
        GPCR0 = (1<<17);        /* drive GPIO17 low */
        GPSR0 = (1<<17);        /* drive GPIO17 high */
 
-#if CFG_DA9030_EXTON_DELAY
-       udelay((unsigned long) CFG_DA9030_EXTON_DELAY); /* wait for DA9030 */
+#if CONFIG_SYS_DA9030_EXTON_DELAY
+       udelay((unsigned long) CONFIG_SYS_DA9030_EXTON_DELAY);  /* wait for DA9030 */
 #endif
        GPCR0 = (1<<17);        /* drive GPIO17 low */