Home Home > GIT Browse > SLE12-SP4-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-05-14 15:35:07 +0200
committerTakashi Iwai <tiwai@suse.de>2019-05-14 15:35:07 +0200
commit8b5ba54ac677b1ebb0b6cc761edbb2e5e225c8a3 (patch)
treeb0b9f62b83ce3e76d21df4cb7b526bcb0e83cac5
parentff7db7da7f0fb32692fd7cf1add421c5f1a665ff (diff)
parent41cec823662d28bc764a6b5787b1fae8446e4877 (diff)
Merge branch 'users/fbaumanis/SLE15/for-next' into SLE15
Pull dt fix from Fabian Baumanis suse-commit: 25966158d5321328eb1e107b01a0feabb061986a
-rw-r--r--Documentation/devicetree/bindings/net/ethernet.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/net/ethernet.txt b/Documentation/devicetree/bindings/net/ethernet.txt
index d4abe9a98109..905c87565d24 100644
--- a/Documentation/devicetree/bindings/net/ethernet.txt
+++ b/Documentation/devicetree/bindings/net/ethernet.txt
@@ -29,7 +29,7 @@ The following properties are common to the Ethernet controllers:
* "smii"
* "xgmii"
* "trgmii"
- * "2000base-x",
+ * "1000base-x",
* "2500base-x",
* "rxaui"
* "xaui"