diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2009-11-23 16:49:36 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2009-11-23 16:49:36 -0500 |
commit | 2cfcadde83b308240690ff1c18f117d8bc7a08b0 (patch) | |
tree | aa0795966d070d1f7a5221232d9ba47744bddb5f /drivers/net/fec_mpc52xx.c | |
parent | e91edcf5a2940bb7f1f316c871dfe9e2aaf9d6d9 (diff) | |
parent | 648f4e3e50c4793d9dbf9a09afa193631f76fa26 (diff) |
Merge commit 'v2.6.32-rc8'
Diffstat (limited to 'drivers/net/fec_mpc52xx.c')
-rw-r--r-- | drivers/net/fec_mpc52xx.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c index c40113f58963..66dace6d324f 100644 --- a/drivers/net/fec_mpc52xx.c +++ b/drivers/net/fec_mpc52xx.c | |||
@@ -759,12 +759,6 @@ static void mpc52xx_fec_reset(struct net_device *dev) | |||
759 | 759 | ||
760 | mpc52xx_fec_hw_init(dev); | 760 | mpc52xx_fec_hw_init(dev); |
761 | 761 | ||
762 | if (priv->phydev) { | ||
763 | phy_stop(priv->phydev); | ||
764 | phy_write(priv->phydev, MII_BMCR, BMCR_RESET); | ||
765 | phy_start(priv->phydev); | ||
766 | } | ||
767 | |||
768 | bcom_fec_rx_reset(priv->rx_dmatsk); | 762 | bcom_fec_rx_reset(priv->rx_dmatsk); |
769 | bcom_fec_tx_reset(priv->tx_dmatsk); | 763 | bcom_fec_tx_reset(priv->tx_dmatsk); |
770 | 764 | ||