Fix merge problems

[u-boot.git] / include / configs / trab.h

diff --git a/include/configs/trab.h b/include/configs/trab.h
index de36fca11e745701043d3612b058c41268ec0042..b0615a0e37753b5d2481bfa82e1e414755630722 100644 (file)
--- a/include/configs/trab.h
+++ b/include/configs/trab.h
@@ -289,7 +289,8 @@
 
 #if 1  /* feel free to disable for development */
 #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      "R"     /* 1st "password"       */
 #endif