diff --git a/[refs] b/[refs] index 62d69c10eeca..cb57b210e512 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 09e06f652d86d358583df0b601c0c4d11923dd88 +refs/heads/master: bc1e0a095e9b8c4df4a2eedd7dc6a9d470a0e6b7 diff --git a/trunk/drivers/net/phy/phy_device.c b/trunk/drivers/net/phy/phy_device.c index a8b74cdab1ea..e275df8c55bc 100644 --- a/trunk/drivers/net/phy/phy_device.c +++ b/trunk/drivers/net/phy/phy_device.c @@ -364,7 +364,7 @@ EXPORT_SYMBOL(genphy_config_advert); */ int genphy_setup_forced(struct phy_device *phydev) { - int ctl = BMCR_RESET; + int ctl = 0; phydev->pause = phydev->asym_pause = 0;