diff options
| author | Tom Rini <[email protected]> | 2021-02-22 09:06:36 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-02-22 09:06:36 -0500 |
| commit | 3c2ec6cb31522dfb3a35a6321768e3bb54ebe386 (patch) | |
| tree | bb83bd3ca55ea5706831150af1d0ee97f54b8531 /drivers | |
| parent | bbc0fcc302bab4521b1b87036c791ed2e8a33ea6 (diff) | |
| parent | 44a7cc82b39b251af3e068cd6827bb35c5d71472 (diff) | |
Merge branch '2021-02-21-mpc83xx-updates'
- mpc8379erdb DM_MMC conversion
- kmeter1 updates
- qe_uec fixes
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/qe/dm_qe_uec.c | 4 | ||||
| -rw-r--r-- | drivers/net/qe/uec.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/qe/dm_qe_uec.c b/drivers/net/qe/dm_qe_uec.c index b08c79244c9..eb0501bc5a8 100644 --- a/drivers/net/qe/dm_qe_uec.c +++ b/drivers/net/qe/dm_qe_uec.c @@ -172,8 +172,8 @@ static int uec_set_mac_if_mode(struct uec_priv *uec) break; default: return -EINVAL; - } - break; + } + break; case SPEED_1000: maccfg2 |= MACCFG2_INTERFACE_MODE_BYTE; switch (enet_if_mode) { diff --git a/drivers/net/qe/uec.h b/drivers/net/qe/uec.h index 7cd4b8737a8..32b7d3e5613 100644 --- a/drivers/net/qe/uec.h +++ b/drivers/net/qe/uec.h @@ -678,7 +678,7 @@ struct uec_priv { int grace_stopped_tx; int grace_stopped_rx; int the_first_run; -#if !defined(COFIG_DM) +#if !defined(CONFIG_DM) /* PHY specific */ struct uec_mii_info *mii_info; int oldspeed; |