| commit | d79aec83b2c348f49065a4d411e7b70bdf041c89 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Wed Dec 28 13:16:59 2011 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Wed Dec 28 13:16:59 2011 -0500 |
| tree | 167d3ab25d29b28b44dc8c1f7d29e29f455493f4 | |
| parent | c3b084c24c8a372026d95497dbb0da22c6eb591c [diff] | |
| parent | 54b07dca68557b0952585b5f4834cd0dd86eba35 [diff] |
Merge branch 'nf-next' of git://1984.lsi.us.es/net-next
diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c index 4ea2bdc..b0b0445 100644 --- a/drivers/net/ethernet/freescale/fec.c +++ b/drivers/net/ethernet/freescale/fec.c
@@ -255,7 +255,7 @@ #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)