diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-10-02 08:54:42 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-10-02 08:54:42 +0200 |
| commit | 52a0febb3dbe06e233f04d5c670fd662b85c1d95 (patch) | |
| tree | 2da4fc542339d219af8295057724ccb9d0bb3462 /drivers | |
| parent | 6209c242748e53a64ec7a2b41c30cc6a894a784e (diff) | |
| parent | c5b4f09cff9c60d73dd3292157a3f88534fb6e10 (diff) | |
| download | barebox-52a0febb3dbe06e233f04d5c670fd662b85c1d95.tar.gz barebox-52a0febb3dbe06e233f04d5c670fd662b85c1d95.tar.xz | |
Merge branch 'for-next/phycore-imx6'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/phy/micrel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 8aea6534b8..88c64e59a0 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -254,11 +254,11 @@ static struct phy_driver ksphy_driver[] = { .config_aneg = genphy_config_aneg, .read_status = genphy_read_status, }, { + /* I saw the same issue like PHY_ID_KSZ9021 for Asym_Pause */ .phy_id = PHY_ID_KSZ9031, .phy_id_mask = 0x00fffff0, .drv.name = "Micrel KSZ9031 Gigabit PHY", - .features = (PHY_GBIT_FEATURES | SUPPORTED_Pause - | SUPPORTED_Asym_Pause), + .features = (PHY_GBIT_FEATURES | SUPPORTED_Pause), .config_init = kszphy_config_init, .config_aneg = genphy_config_aneg, .read_status = genphy_read_status, |