Merge branch 'next' of ../next

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

diff --git a/include/configs/netstar.h b/include/configs/netstar.h
index f0b4207..20b423b 100644 (file)
--- a/include/configs/netstar.h
+++ b/include/configs/netstar.h
@@ -93,7 +93,8 @@
 #define CONFIG_SYS_NS16550_CLK         (CONFIG_XTAL_FREQ)      /* can be 12M/32Khz or 48Mhz  */
 #define CONFIG_SYS_NS16550_COM1                OMAP1510_UART1_BASE     /* uart1 */
 
-#define CONFIG_DRIVER_SMC91111
+#define CONFIG_NET_MULTI
+#define CONFIG_SMC91111
 #define CONFIG_SMC91111_BASE           0x04000300
 
 #define CONFIG_SYS_FLASH_BASE          PHYS_FLASH_1
@@ -110,8 +111,6 @@
 #define CONFIG_SYS_NAND_BASE           0x04000000 + (2 << 23)
 #define NAND_ALLOW_ERASE_ALL           1
 
-#define CONFIG_SYS_64BIT_VSPRINTF              /* needed for nand_util.c */
-
 #define CONFIG_HARD_I2C
 #define CONFIG_SYS_I2C_SPEED           100000
 #define CONFIG_SYS_I2C_SLAVE           1