diff options
author | James Morris | 2017-11-29 02:47:41 +0100 |
---|---|---|
committer | James Morris | 2017-11-29 02:47:41 +0100 |
commit | cf40a76e7d5874bb25f4404eecc58a2e033af885 (patch) | |
tree | 8fd81cbea03c87b3d41d7ae5b1d11eadd35d6ef5 /Documentation/devicetree/bindings/net/allwinner,sun7i-a20-gmac.txt | |
parent | security: fix description of values returned by cap_inode_need_killpriv (diff) | |
parent | Linux 4.15-rc1 (diff) | |
download | kernel-qcow2-linux-cf40a76e7d5874bb25f4404eecc58a2e033af885.tar.gz kernel-qcow2-linux-cf40a76e7d5874bb25f4404eecc58a2e033af885.tar.xz kernel-qcow2-linux-cf40a76e7d5874bb25f4404eecc58a2e033af885.zip |
Merge tag 'v4.15-rc1' into next-seccomp
Linux 4.15-rc1
Diffstat (limited to 'Documentation/devicetree/bindings/net/allwinner,sun7i-a20-gmac.txt')
-rw-r--r-- | Documentation/devicetree/bindings/net/allwinner,sun7i-a20-gmac.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/net/allwinner,sun7i-a20-gmac.txt b/Documentation/devicetree/bindings/net/allwinner,sun7i-a20-gmac.txt index ea4d752389a2..8b3f953656e3 100644 --- a/Documentation/devicetree/bindings/net/allwinner,sun7i-a20-gmac.txt +++ b/Documentation/devicetree/bindings/net/allwinner,sun7i-a20-gmac.txt @@ -15,7 +15,7 @@ Optional properties: Examples: - gmac: ethernet@01c50000 { + gmac: ethernet@1c50000 { compatible = "allwinner,sun7i-a20-gmac"; reg = <0x01c50000 0x10000>, <0x01c20164 0x4>; |