Fix merge problems

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

diff --git a/include/configs/KUP4X.h b/include/configs/KUP4X.h
index e558aa481b3d6f1adb43e49c841358f1ea6afb16..be0c7af8f3e811c54969842991cae9ccccb2cfaf 100644 (file)
--- a/include/configs/KUP4X.h
+++ b/include/configs/KUP4X.h
@@ -454,7 +454,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