Fix merge problems

[people/ms/u-boot.git] / include / configs / rmu.h

diff --git a/include/configs/rmu.h b/include/configs/rmu.h
index 28fb7c3318cf86110c6fa7d3560eb3c800e8eb33..596bf15566056717a00569e0f150e00f4d715c75 100644 (file)
--- a/include/configs/rmu.h
+++ b/include/configs/rmu.h
@@ -111,7 +111,8 @@
 
 
 #define        CONFIG_AUTOBOOT_KEYED           /* Enable password protection */
-#define        CONFIG_AUTOBOOT_PROMPT          "\nEnter password - autoboot in %d sec...\n"
+#define        CONFIG_AUTOBOOT_PROMPT          \
+       "\nEnter password - autoboot in %d sec...\n", bootdelay
 #define        CONFIG_AUTOBOOT_DELAY_STR       "system"
 
 /*