commit f2302d4430e7f3f48308d6a585320fe96af8afbd
author Stefan Roese <sr@denx.de> Wed Aug 06 14:05:38 2008 +0200
committer Stefan Roese <sr@denx.de> Wed Aug 06 14:05:38 2008 +0200
tree eec529fa883a32b0bd44f65aa46a454dc5c69688
parent 9246f5ecfd353ae297a02ffd5328402acf16c9dd

Fix merge problems

Signed-off-by: Stefan Roese <sr@denx.de>

include/configs/KUP4X.h

diff --git a/include/configs/KUP4X.h b/include/configs/KUP4X.h
index e558aa4..be0c7af 100644
--- 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