Fix merge problems

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

diff --git a/include/configs/KUP4K.h b/include/configs/KUP4K.h
index f6c31ea84972e2ca8c2cce256e79f073dcf062e1..e52fbfde0e74be74d3d97069e7992acd047ddc14 100644 (file)
--- a/include/configs/KUP4K.h
+++ b/include/configs/KUP4K.h
@@ -488,7 +488,8 @@
 
 #define CONFIG_AUTOBOOT_KEYED          /* use key strings to stop autoboot */
 #if 0
-#define CONFIG_AUTOBOOT_PROMPT         "Boote in %d Sekunden - stop mit \"2\"\n"
+#define CONFIG_AUTOBOOT_PROMPT         \
+       "Boote in %d Sekunden - stop mit \"2\"\n", bootdelay
 #endif
 #define CONFIG_AUTOBOOT_STOP_STR       "." /* easy to stop for now */
 #define CONFIG_SILENT_CONSOLE  1