From deeb82973c38906e285a839780d89fd6ebb38531 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Wed, 28 Dec 2011 13:16:59 -0500
Subject: [PATCH] --- yaml --- r: 279115 b: refs/heads/master c:
 d79aec83b2c348f49065a4d411e7b70bdf041c89 h: refs/heads/master i:   279113:
 9dd94265a5734638a97da9ded705e2de6503cb71   279111:
 a74c614b6f254483af2aedadf287a1962bdd9e97 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/net/ethernet/freescale/fec.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f1d1bd2aaca4..eda8be5d81a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54b07dca68557b0952585b5f4834cd0dd86eba35
+refs/heads/master: d79aec83b2c348f49065a4d411e7b70bdf041c89
diff --git a/trunk/drivers/net/ethernet/freescale/fec.c b/trunk/drivers/net/ethernet/freescale/fec.c
index 4ea2bdc852f8..b0b04453c7cc 100644
--- a/trunk/drivers/net/ethernet/freescale/fec.c
+++ b/trunk/drivers/net/ethernet/freescale/fec.c
@@ -255,7 +255,7 @@ struct fec_enet_private {
 #define FEC_MMFR_TA		(2 << 16)
 #define FEC_MMFR_DATA(v)	(v & 0xffff)
 
-#define FEC_MII_TIMEOUT		1000 /* us */
+#define FEC_MII_TIMEOUT		30000 /* us */
 
 /* Transmitter timeout */
 #define TX_TIMEOUT (2 * HZ)