From f2302d4430e7f3f48308d6a585320fe96af8afbd Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Wed, 6 Aug 2008 14:05:38 +0200 Subject: Fix merge problems Signed-off-by: Stefan Roese --- include/configs/MVBLUE.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'include/configs/MVBLUE.h') diff --git a/include/configs/MVBLUE.h b/include/configs/MVBLUE.h index d08d79520..8e247af63 100644 --- a/include/configs/MVBLUE.h +++ b/include/configs/MVBLUE.h @@ -59,17 +59,18 @@ #define CONFIG_CLOCKS_IN_MHZ 1 -#define CONFIG_BOARD_TYPES 1 +#define CONFIG_BOARD_TYPES 1 #define CONFIG_CONS_INDEX 1 #define CONFIG_BAUDRATE 115200 #define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } -#define CONFIG_BOOTDELAY 3 +#define CONFIG_BOOTDELAY 3 #define CONFIG_BOOT_RETRY_TIME -1 #define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_PROMPT "autoboot in %d seconds (stop with 's')...\n" +#define CONFIG_AUTOBOOT_PROMPT \ + "autoboot in %d seconds (stop with 's')...\n", bootdelay #define CONFIG_AUTOBOOT_STOP_STR "s" #define CONFIG_ZERO_BOOTDELAY_CHECK #define CONFIG_RESET_TO_RETRY 60 -- cgit v1.2.3