git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[pandora-kernel.git]
/
drivers
/
net
/
phy
/
marvell.c
diff --git
a/drivers/net/phy/marvell.c
b/drivers/net/phy/marvell.c
index
7a3ec9d
..
dd6f54d
100644
(file)
--- a/
drivers/net/phy/marvell.c
+++ b/
drivers/net/phy/marvell.c
@@
-243,6
+243,7
@@
static int m88e1111_config_init(struct phy_device *phydev)
temp &= ~(MII_M1111_HWCFG_MODE_MASK);
temp |= MII_M1111_HWCFG_MODE_SGMII_NO_CLK;
+ temp |= MII_M1111_HWCFG_FIBER_COPPER_AUTO;
err = phy_write(phydev, MII_M1111_PHY_EXT_SR, temp);
if (err < 0)