diff options
author | Stefan Roese <sr@denx.de> | 2008-08-06 14:05:38 +0200 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2008-08-06 14:05:38 +0200 |
commit | f2302d4430e7f3f48308d6a585320fe96af8afbd (patch) | |
tree | eec529fa883a32b0bd44f65aa46a454dc5c69688 /include/configs/trab.h | |
parent | 9246f5ecfd353ae297a02ffd5328402acf16c9dd (diff) | |
download | bootable_bootloader_goldelico_gta04-f2302d4430e7f3f48308d6a585320fe96af8afbd.zip bootable_bootloader_goldelico_gta04-f2302d4430e7f3f48308d6a585320fe96af8afbd.tar.gz bootable_bootloader_goldelico_gta04-f2302d4430e7f3f48308d6a585320fe96af8afbd.tar.bz2 |
Fix merge problems
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'include/configs/trab.h')
-rw-r--r-- | include/configs/trab.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/configs/trab.h b/include/configs/trab.h index de36fca..b0615a0 100644 --- a/include/configs/trab.h +++ b/include/configs/trab.h @@ -289,7 +289,8 @@ #if 1 /* feel free to disable for development */ #define CONFIG_AUTOBOOT_KEYED /* Enable password protection */ -#define CONFIG_AUTOBOOT_PROMPT "\nEnter password - autoboot in %d sec...\n" +#define CONFIG_AUTOBOOT_PROMPT \ + "\nEnter password - autoboot in %d sec...\n", bootdelay #define CONFIG_AUTOBOOT_DELAY_STR "R" /* 1st "password" */ #endif |