From f2302d4430e7f3f48308d6a585320fe96af8afbd Mon Sep 17 00:00:00 2001
From: Stefan Roese <sr@denx.de>
Date: Wed, 6 Aug 2008 14:05:38 +0200
Subject: Fix merge problems

Signed-off-by: Stefan Roese <sr@denx.de>
---
 include/configs/hymod.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/configs/hymod.h')

diff --git a/include/configs/hymod.h b/include/configs/hymod.h
index 01e797016..264192f26 100644
--- 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
-- 
cgit v1.2.3