diff options
author | Markus Klotzbuecher <mk@denx.de> | 2008-08-04 17:18:14 (GMT) |
---|---|---|
committer | Markus Klotzbuecher <mk@denx.de> | 2008-08-04 17:18:14 (GMT) |
commit | 0f2b5d8ec0969a5b0992f5031bf3c61117a41d59 (patch) | |
tree | fc05bf5db93e5a9c1712d24a5efdff94685063c2 /common/main.c | |
parent | ab06bddb04ed4be50a8f9ad5f94fa23953a734e3 (diff) | |
parent | 81091f58f0c58ecd26c5b05de2ae20ca6cdb521c (diff) | |
download | u-boot-0f2b5d8ec0969a5b0992f5031bf3c61117a41d59.tar.xz |
Merge branch 'master' of git://www.denx.de/git/u-boot
Diffstat (limited to 'common/main.c')
-rw-r--r-- | common/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/main.c b/common/main.c index 79ad291..187ef8a 100644 --- a/common/main.c +++ b/common/main.c @@ -116,7 +116,7 @@ static __inline__ int abortboot(int bootdelay) u_int i; # ifdef CONFIG_AUTOBOOT_PROMPT - printf(CONFIG_AUTOBOOT_PROMPT, bootdelay); + printf(CONFIG_AUTOBOOT_PROMPT); # endif # ifdef CONFIG_AUTOBOOT_DELAY_STR @@ -212,7 +212,7 @@ static __inline__ int abortboot(int bootdelay) int abort = 0; #ifdef CONFIG_MENUPROMPT - printf(CONFIG_MENUPROMPT, bootdelay); + printf(CONFIG_MENUPROMPT); #else printf("Hit any key to stop autoboot: %2d ", bootdelay); #endif |