diff options
| author |   Mark Brown <broonie@linaro.org> | 2013-06-14 10:16:06 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-14 10:16:06 +0100 |
| commit | 384b8345589cbbb18a99ce1b112da90c58c802e8 (patch) | |
| tree | 51fee39fa19adad6b24fb90123e7a0ca3159c9c5 /drivers/net/ethernet/xilinx/xilinx_emaclite.c | |
| parent | ASoC: wm8962: Restore device state after reset in runtime resume (diff) | |
| parent | ASoC: wm8962: Remove remaining direct register cache accesses (diff) | |
| download | wireguard-linux-384b8345589cbbb18a99ce1b112da90c58c802e8.tar.xz wireguard-linux-384b8345589cbbb18a99ce1b112da90c58c802e8.zip | |
Merge branch 'fix/wm8962' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-wm8962
Conflicts:
sound/soc/codecs/wm8962.c
Diffstat (limited to 'drivers/net/ethernet/xilinx/xilinx_emaclite.c')
| -rw-r--r-- | drivers/net/ethernet/xilinx/xilinx_emaclite.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c index 919b983114e9..b7268b3dae77 100644 --- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c +++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c @@ -946,7 +946,8 @@ static int xemaclite_open(struct net_device *dev) phy_write(lp->phy_dev, MII_CTRL1000, 0); /* Advertise only 10 and 100mbps full/half duplex speeds */ - phy_write(lp->phy_dev, MII_ADVERTISE, ADVERTISE_ALL); + phy_write(lp->phy_dev, MII_ADVERTISE, ADVERTISE_ALL | + ADVERTISE_CSMA); /* Restart auto negotiation */ bmcr = phy_read(lp->phy_dev, MII_BMCR); |