diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-03-06 11:56:40 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-03-06 11:56:40 +0100 |
| commit | 1941011a8bd26f01f36f827d5ebc6469749485bb (patch) | |
| tree | 841ae1b789ec642bad8782b2e2bf0eda8ac514db /drivers/net/phy/broadcom.c | |
| parent | fdb64822443ec9fb8c3a74b598a74790ae8d2e22 (diff) | |
| parent | b95b4d5ef061806fde07a6a3255e6c07f4fed0d3 (diff) | |
Merge branch 'perf/urgent' into perf/core, to pick up the latest fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/phy/broadcom.c')
| -rw-r--r-- | drivers/net/phy/broadcom.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c index 7d68b28bb893..a62229a8b1a4 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c @@ -410,7 +410,7 @@ static int bcm5481_config_aneg(struct phy_device *phydev) struct device_node *np = phydev->mdio.dev.of_node; int ret; - /* Aneg firsly. */ + /* Aneg firstly. */ ret = genphy_config_aneg(phydev); /* Then we can set up the delay. */ @@ -463,7 +463,7 @@ static int bcm54616s_config_aneg(struct phy_device *phydev) { int ret; - /* Aneg firsly. */ + /* Aneg firstly. */ if (phydev->dev_flags & PHY_BCM_FLAGS_MODE_1000BX) ret = genphy_c37_config_aneg(phydev); else |