From c9c5bcf9a1cc718592f40e331dd937355b78a47a Mon Sep 17 00:00:00 2001 From: Wang Jian Date: Wed, 16 Jul 2008 21:46:17 +0800 Subject: [PATCH] --- yaml --- r: 104918 b: refs/heads/master c: 9cf8fa4334e60f27b4a392f432c292f3af268215 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/phy/marvell.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 375be78fa015..e62bcf4486ff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c0e5a8c21bb9bb222917c36eba503ae88af52c34 +refs/heads/master: 9cf8fa4334e60f27b4a392f432c292f3af268215 diff --git a/trunk/drivers/net/phy/marvell.c b/trunk/drivers/net/phy/marvell.c index 32a8503a7acd..737512c00971 100644 --- a/trunk/drivers/net/phy/marvell.c +++ b/trunk/drivers/net/phy/marvell.c @@ -162,7 +162,7 @@ static int m88e1111_config_init(struct phy_device *phydev) /* Enable Fiber/Copper auto selection */ temp = phy_read(phydev, MII_M1111_PHY_EXT_SR); - temp |= MII_M1111_HWCFG_FIBER_COPPER_AUTO; + temp &= ~MII_M1111_HWCFG_FIBER_COPPER_AUTO; phy_write(phydev, MII_M1111_PHY_EXT_SR, temp); temp = phy_read(phydev, MII_BMCR);