diff options
| author | Xinyu Chen <xinyu.chen@freescale.com> | 2013-01-04 13:41:54 +0800 |
|---|---|---|
| committer | Xinyu Chen <xinyu.chen@freescale.com> | 2013-01-04 13:41:54 +0800 |
| commit | ccce7dc63f494aaed6bd3ea55b9e14c76da0931e (patch) | |
| tree | 6892e44aff8fda5dac08bb0aefa6a0d9b3b92af2 /drivers/net | |
| parent | 60daab290bbab00c73cc057ff868f658ec73d304 (diff) | |
| parent | c27cb3851bb6f822f8a92e4a1e10fba19284bdd4 (diff) | |
Merge tag 'rel_imx_3.0.35_1.1.0' into imx_3.0.35_android
Conflicts:
drivers/mxc/vpu/mxc_vpu.c
drivers/usb/gadget/arcotg_udc.c
sound/soc/imx/imx-wm8962.c
Diffstat (limited to 'drivers/net')
| -rwxr-xr-x | drivers/net/fec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/fec.c b/drivers/net/fec.c index 23f688c6a585..d09aa984c97e 100755 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c @@ -1046,6 +1046,9 @@ static int fec_enet_mii_probe(struct net_device *ndev) else phy_dev->supported &= PHY_BASIC_FEATURES; + /* enable phy pause frame for any platform */ + phy_dev->supported |= ADVERTISED_Pause; + phy_dev->advertising = phy_dev->supported; fep->phy_dev = phy_dev; |