Merge branch 'next' of ../custodians into next

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

diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h
index 3972ebce6f41d72566d963b1abdf11eb509d64ee..04cdc210e62b3a81522159c29cfedbcf786314dd 100644 (file)
--- a/include/configs/davinci_schmoogie.h
+++ b/include/configs/davinci_schmoogie.h
@@ -69,6 +69,7 @@
 /* Network & Ethernet Configuration */
 /*==================================*/
 #define CONFIG_DRIVER_TI_EMAC
+#define CONFIG_EMAC_MDIO_PHY_NUM       1
 #define CONFIG_MII
 #define CONFIG_BOOTP_DEFAULT
 #define CONFIG_BOOTP_DNS
@@ -98,7 +99,6 @@
 /*=====================*/
 #define CONFIG_RTC_DS1307              /* RTC chip on SCHMOOGIE */
 #define CONFIG_SYS_I2C_RTC_ADDR        0x6f    /* RTC chip I2C address */
-#define CONFIG_HAS_UID
 #define CONFIG_UID_DS28CM00            /* Unique ID on SCHMOOGIE */
 #define CONFIG_SYS_UID_ADDR            0x50    /* UID chip I2C address */
 /*==============================*/