Fix merge problems

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

diff --git a/include/configs/hymod.h b/include/configs/hymod.h
index 01e79701623a0b28990b60353f3b26b474043ef8..264192f2620b3b7999c3ab9b19e8fe5dffee4504 100644 (file)
--- a/include/configs/hymod.h
+++ b/include/configs/hymod.h
@@ -224,7 +224,7 @@
  */
 #define CONFIG_AUTOBOOT_KEYED
 #define CONFIG_AUTOBOOT_PROMPT         "Autobooting in %d seconds, " \
-                                       "press <SPACE> to stop\n"
+                                       "press <SPACE> to stop\n", bootdelay
 #define CONFIG_AUTOBOOT_STOP_STR       " "
 #undef CONFIG_AUTOBOOT_DELAY_STR
 #define DEBUG_BOOTKEYS         0