net: macb: add support for gigabit MAC

[karo-tx-uboot.git] / drivers / net / davinci_emac.c

diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index b2516d176892e05c44881e13fe47719b41a1df69..1db586d6b276008afba73c4c30a397373a452c3e 100644 (file)
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -897,7 +897,8 @@ int davinci_emac_initialize(void)
        }
 
 #if defined(CONFIG_DRIVER_TI_EMAC_USE_RMII) && \
-               defined(CONFIG_MACH_DAVINCI_DA850_EVM)
+               defined(CONFIG_MACH_DAVINCI_DA850_EVM) && \
+                       !defined(CONFIG_DRIVER_TI_EMAC_RMII_NO_NEGOTIATE)
        for (i = 0; i < num_phy; i++) {
                if (phy[i].is_phy_connected(i))
                        phy[i].auto_negotiate(i);