Merge branch 'master' into next

[u-boot] / include / configs / EP1C20.h

diff --git a/include/configs/EP1C20.h b/include/configs/EP1C20.h
index 8941e4df53536558c39b6038bc4d28b86932e99b..61d8e20f9bfd036a3b0f8bf71d94c09455256bfd 100644 (file)
--- a/include/configs/EP1C20.h
+++ b/include/configs/EP1C20.h
@@ -151,7 +151,8 @@
  * cache bypass so there's no need to monkey with inx/outx macros.
  *----------------------------------------------------------------------*/
 #define CONFIG_SMC91111_BASE   0x82110300      /* Base addr (bypass)   */
-#define CONFIG_DRIVER_SMC91111                 /* Using SMC91c111      */
+#define CONFIG_NET_MULTI
+#define CONFIG_SMC91111                        /* Using SMC91c111      */
 #undef CONFIG_SMC91111_EXT_PHY                 /* Internal PHY         */
 #define CONFIG_SMC_USE_32_BIT                  /* 32-bit interface     */