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/netstar.h | |
| parent | 9246f5ecfd353ae297a02ffd5328402acf16c9dd (diff) | |
| download | u-boot-imx-f2302d4430e7f3f48308d6a585320fe96af8afbd.zip u-boot-imx-f2302d4430e7f3f48308d6a585320fe96af8afbd.tar.gz u-boot-imx-f2302d4430e7f3f48308d6a585320fe96af8afbd.tar.bz2 | |
Fix merge problems
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'include/configs/netstar.h')
| -rw-r--r-- | include/configs/netstar.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/configs/netstar.h b/include/configs/netstar.h index d4deda4..756b7c2 100644 --- a/include/configs/netstar.h +++ b/include/configs/netstar.h @@ -195,7 +195,8 @@ #if 0 /* feel free to disable for development */ #define CONFIG_AUTOBOOT_KEYED /* Enable password protection */ -#define CONFIG_AUTOBOOT_PROMPT "\nNetStar PBX - boot in %d secs...\n" +#define CONFIG_AUTOBOOT_PROMPT \ + "\nNetStar PBX - boot in %d secs...\n", bootdelay #define CONFIG_AUTOBOOT_DELAY_STR "." /* 1st "password" */ #endif |