diff options
| author | David S. Miller <[email protected]> | 2017-06-07 02:20:08 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2017-06-07 02:20:08 +0000 |
| commit | 216fe8f021e33c36e3b27c49c9f1951f6b037d7f (patch) | |
| tree | a43daec41b4d3955e7a4f8d0ed0654a7c80527ec /drivers/net/phy/phy.c | |
| parent | Merge branch 'phylib-support-for-MV88X3310-10G-phy' (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | kernel-216fe8f021e33c36e3b27c49c9f1951f6b037d7f.tar.gz kernel-216fe8f021e33c36e3b27c49c9f1951f6b037d7f.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Just some simple overlapping changes in marvell PHY driver
and the DSA core code.
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'drivers/net/phy/phy.c')
| -rw-r--r-- | drivers/net/phy/phy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 12548e5b6037..14fc5bc75cd1 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -266,7 +266,7 @@ static const struct phy_setting settings[] = { * phy_lookup_setting - lookup a PHY setting * @speed: speed to match * @duplex: duplex to match - * @feature: allowed link modes + * @features: allowed link modes * @exact: an exact match is required * * Search the settings array for a setting that matches the speed and |