diff options
author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-12-14 23:01:00 -0500 |
---|---|---|
committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-12-14 23:01:00 -0500 |
commit | 83a2c36c8f93b2c7ba6bd7ca5d0434c27aaa1e88 (patch) | |
tree | 99b3d645f7ce13c1e6801a72d3a09c8deebe45db /drivers/net/phy/micrel.c | |
parent | 2f8f64834b7cc5374b0b1f4ce328bc8f24115abf (diff) | |
parent | 3781db07c79e7e4c5273c902f9c4718795866a1c (diff) | |
download | linux-rt-83a2c36c8f93b2c7ba6bd7ca5d0434c27aaa1e88.tar.gz |
Merge tag 'v4.9.68' into v4.9-rt
This is the 4.9.68 stable release
Diffstat (limited to 'drivers/net/phy/micrel.c')
-rw-r--r-- | drivers/net/phy/micrel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 222918828655..fbf5945ce00d 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -1020,7 +1020,7 @@ static struct phy_driver ksphy_driver[] = { .phy_id = PHY_ID_KSZ8795, .phy_id_mask = MICREL_PHY_ID_MASK, .name = "Micrel KSZ8795", - .features = (SUPPORTED_Pause | SUPPORTED_Asym_Pause), + .features = PHY_BASIC_FEATURES, .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .config_init = kszphy_config_init, .config_aneg = ksz8873mll_config_aneg, |