Fix merge problems

[platform/kernel/u-boot.git] / include / configs / trab.h

diff --git a/include/configs/trab.h b/include/configs/trab.h
index b9088a8..b0615a0 100644 (file)
--- a/include/configs/trab.h
+++ b/include/configs/trab.h
@@ -69,8 +69,8 @@
  * address 0x54 with 8bit addressing
  ***********************************************************/
 #define CONFIG_HARD_I2C                        /* I2C with hardware support */
-#define CFG_I2C_SPEED          100000  /* I2C speed */
-#define CFG_I2C_SLAVE          0x7F    /* I2C slave addr */
+#define CFG_I2C_SPEED          100000  /* I2C speed */
+#define CFG_I2C_SLAVE          0x7F    /* I2C slave addr */
 
 #define CFG_I2C_EEPROM_ADDR    0x54    /* EEPROM address */
 #define CFG_I2C_EEPROM_ADDR_LEN        1       /* 1 address byte */
@@ -237,7 +237,7 @@
        "mdm_init2=ATS0=1\0" \
        "mdm_flow_control=rts/cts\0"
 #endif /* CFG_HUSH_PARSER */
-#else  /* CONFIG_FLASH_8MB      => 8 MB flash */
+#else  /* CONFIG_FLASH_8MB      => 8 MB flash */
 #ifdef CFG_HUSH_PARSER
 #define        CONFIG_EXTRA_ENV_SETTINGS       \
        "nfs_args=setenv bootargs root=/dev/nfs rw " \
@@ -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