Fix merge problems

[u-boot] / include / configs / SXNI855T.h

diff --git a/include/configs/SXNI855T.h b/include/configs/SXNI855T.h
index 3aee45c3c7c8cd0304557cd94fd961425ae90efd..aefc7eecbd121ff7e5bc9690668ad1eba8ee33b8 100644 (file)
--- a/include/configs/SXNI855T.h
+++ b/include/configs/SXNI855T.h
@@ -465,7 +465,7 @@
 
 #if 1
 #define CONFIG_AUTOBOOT_KEYED          /* use key strings to stop autoboot */
-#define CONFIG_AUTOBOOT_PROMPT         "autoboot in %d seconds\n"
+#define CONFIG_AUTOBOOT_PROMPT         "autoboot in %d seconds\n", bootdelay
 #define CONFIG_AUTOBOOT_DELAY_STR      "delayabit"
 #define CONFIG_AUTOBOOT_STOP_STR       " " /* easy to stop for now */
 #endif