Fix merge problems

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

diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h
index 7ac51b5..f040b86 100644 (file)
--- a/include/configs/atngw100.h
+++ b/include/configs/atngw100.h
@@ -82,8 +82,8 @@
 #define CONFIG_BOOTDELAY               1
 #define CONFIG_AUTOBOOT                        1
 #define CONFIG_AUTOBOOT_KEYED          1
-#define CONFIG_AUTOBOOT_PROMPT                         \
-       "Press SPACE to abort autoboot in %d seconds\n"
+#define CONFIG_AUTOBOOT_PROMPT         \
+       "Press SPACE to abort autoboot in %d seconds\n", bootdelay
 #define CONFIG_AUTOBOOT_DELAY_STR      "d"
 #define CONFIG_AUTOBOOT_STOP_STR       " "
 
@@ -128,6 +128,7 @@
 #define CFG_NR_PIOS                    5
 #define CFG_HSDRAMC                    1
 #define CONFIG_MMC                     1
+#define CONFIG_ATMEL_MCI               1
 #define CONFIG_ATMEL_SPI               1
 
 #define CONFIG_SPI_FLASH               1