diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-04-22 09:31:43 -0400 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-04-22 09:31:43 -0400 |
| commit | a42c74ee608a424342ef7069ccddf196d873040c (patch) | |
| tree | 75adfb9f5e06ebb7c7d5d5e5a5408fa0d6d504b9 /drivers/net/phy/micrel.c | |
| parent | 97990a060e6757f48b931a3946b17c1c4362c3fb (diff) | |
| parent | 9b383672452bb1097124c76fcb4903e0021f6baf (diff) | |
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
Diffstat (limited to 'drivers/net/phy/micrel.c')
| -rw-r--r-- | drivers/net/phy/micrel.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 29934446436a..abf7b6153d00 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c | |||
| @@ -257,8 +257,7 @@ static struct phy_driver ksphy_driver[] = { | |||
| 257 | .phy_id = PHY_ID_KSZ9021, | 257 | .phy_id = PHY_ID_KSZ9021, |
| 258 | .phy_id_mask = 0x000ffffe, | 258 | .phy_id_mask = 0x000ffffe, |
| 259 | .name = "Micrel KSZ9021 Gigabit PHY", | 259 | .name = "Micrel KSZ9021 Gigabit PHY", |
| 260 | .features = (PHY_GBIT_FEATURES | SUPPORTED_Pause | 260 | .features = (PHY_GBIT_FEATURES | SUPPORTED_Pause), |
| 261 | | SUPPORTED_Asym_Pause), | ||
| 262 | .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, | 261 | .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, |
| 263 | .config_init = kszphy_config_init, | 262 | .config_init = kszphy_config_init, |
| 264 | .config_aneg = genphy_config_aneg, | 263 | .config_aneg = genphy_config_aneg, |