diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-08-17 11:50:48 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-08-17 11:50:48 +0300 |
commit | 2257e268b1154966c5b0141b23695db1043ff39d (patch) | |
tree | dae4b032afb9872568cf7921b39d30c79a6c3fee /drivers/net/dsa/mt7530.h | |
parent | 27aac20574110abfd594175a668dc58b23b2b14a (diff) | |
parent | ac9a40905a610fb02086a37b11ff4bf046825a88 (diff) | |
download | linux-2257e268b1154966c5b0141b23695db1043ff39d.tar.xz |
Merge branch 'linus' into x86/boot, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/dsa/mt7530.h')
-rw-r--r-- | drivers/net/dsa/mt7530.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/dsa/mt7530.h b/drivers/net/dsa/mt7530.h index b83d76b99802..74db9822eb40 100644 --- a/drivers/net/dsa/mt7530.h +++ b/drivers/net/dsa/mt7530.h @@ -151,6 +151,7 @@ enum mt7530_stp_state { #define PMCR_TX_FC_EN BIT(5) #define PMCR_RX_FC_EN BIT(4) #define PMCR_FORCE_SPEED_1000 BIT(3) +#define PMCR_FORCE_SPEED_100 BIT(2) #define PMCR_FORCE_FDX BIT(1) #define PMCR_FORCE_LNK BIT(0) #define PMCR_COMMON_LINK (PMCR_IFG_XMIT(1) | PMCR_MAC_MODE | \ |