diff options
| author | David S. Miller <davem@davemloft.net> | 2019-05-07 17:22:09 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-05-07 17:22:09 -0700 |
| commit | a9e41a529681b38087c91ebc0bb91e12f510ca2d (patch) | |
| tree | 544bf5861113e2f7e676a333a1267d887c800870 /Documentation | |
| parent | 23bfaa594002f4bba085e0a1ae3c9847b988d816 (diff) | |
| parent | a3147770bea76c8dbad73eca3a24c2118da5e719 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor conflict with the DSA legacy code removal.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/net/ethernet.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/net/ethernet.txt b/Documentation/devicetree/bindings/net/ethernet.txt index 699244428a28..e88c3641d613 100644 --- a/Documentation/devicetree/bindings/net/ethernet.txt +++ b/Documentation/devicetree/bindings/net/ethernet.txt @@ -38,7 +38,7 @@ Documentation/devicetree/bindings/phy/phy-bindings.txt. * "smii" * "xgmii" * "trgmii" - * "2000base-x", + * "1000base-x", * "2500base-x", * "rxaui" * "xaui" |