From d7920d87a54363abcf4ea03ff82c9223ae1a86fb Mon Sep 17 00:00:00 2001 From: Vlastimil Kosar Date: Thu, 28 Feb 2013 08:45:22 +0000 Subject: [PATCH] --- yaml --- r: 360792 b: refs/heads/master c: 32fcafbcd1c9f6c7013016a22a5369b4acb93577 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/phy/micrel.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 960b24ebf319..fc0b0cbf0441 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 02e711276d444343656c25b91b42996c62726712 +refs/heads/master: 32fcafbcd1c9f6c7013016a22a5369b4acb93577 diff --git a/trunk/drivers/net/phy/micrel.c b/trunk/drivers/net/phy/micrel.c index 29934446436a..abf7b6153d00 100644 --- a/trunk/drivers/net/phy/micrel.c +++ b/trunk/drivers/net/phy/micrel.c @@ -257,8 +257,7 @@ static struct phy_driver ksphy_driver[] = { .phy_id = PHY_ID_KSZ9021, .phy_id_mask = 0x000ffffe, .name = "Micrel KSZ9021 Gigabit PHY", - .features = (PHY_GBIT_FEATURES | SUPPORTED_Pause - | SUPPORTED_Asym_Pause), + .features = (PHY_GBIT_FEATURES | SUPPORTED_Pause), .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .config_init = kszphy_config_init, .config_aneg = genphy_config_aneg,