Fix merge problems

[karo-tx-uboot.git] / include / configs / netstar.h

diff --git a/include/configs/netstar.h b/include/configs/netstar.h
index d4deda407fbe92f8cb3370c02744e33480da8b0a..756b7c2671759271bd40f098c1365b22b3287da3 100644 (file)
--- a/include/configs/netstar.h
+++ b/include/configs/netstar.h
@@ -195,7 +195,8 @@
 
 #if 0  /* feel free to disable for development */
 #define        CONFIG_AUTOBOOT_KEYED           /* Enable password protection   */
-#define CONFIG_AUTOBOOT_PROMPT         "\nNetStar PBX - boot in %d secs...\n"
+#define CONFIG_AUTOBOOT_PROMPT         \
+       "\nNetStar PBX - boot in %d secs...\n", bootdelay
 #define CONFIG_AUTOBOOT_DELAY_STR      "."     /* 1st "password"       */
 #endif