diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-07-25 11:29:58 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-07-25 11:29:58 +0200 |
| commit | 4765096f4f7829d933354ddffedfad32cf063467 (patch) | |
| tree | e8ab2bfc2062324911de12d034f5d4f222c480b6 /Documentation/devicetree/bindings/net/fsl-fman.txt | |
| parent | af0fffd9300b97d8875aa745bc78e2f6fdb3c1f0 (diff) | |
| parent | f3d133ee0a17d5694c6f21873eec9863e11fa423 (diff) | |
| download | linux-4765096f4f7829d933354ddffedfad32cf063467.tar.bz2 | |
Merge branch 'sched/urgent' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/devicetree/bindings/net/fsl-fman.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/net/fsl-fman.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/net/fsl-fman.txt b/Documentation/devicetree/bindings/net/fsl-fman.txt index df873d1f3b7c..f8c33890bc29 100644 --- a/Documentation/devicetree/bindings/net/fsl-fman.txt +++ b/Documentation/devicetree/bindings/net/fsl-fman.txt @@ -238,7 +238,7 @@ PROPERTIES Must include one of the following: - "fsl,fman-dtsec" for dTSEC MAC - "fsl,fman-xgec" for XGEC MAC - - "fsl,fman-memac for mEMAC MAC + - "fsl,fman-memac" for mEMAC MAC - cell-index Usage: required |