diff options
author | Sean Paul <seanpaul@chromium.org> | 2018-01-19 18:32:05 +0100 |
---|---|---|
committer | Sean Paul <seanpaul@chromium.org> | 2018-01-19 18:32:05 +0100 |
commit | 54156da8937c9f5f84b4215e239a61ecc7c29275 (patch) | |
tree | 7fb1e07ebedc5fbd35a29f5d450dee538763efdb /Documentation/devicetree/bindings/net/mdio.txt | |
parent | drm: add kernel doc for exported gem dmabuf_ops (diff) | |
parent | BackMerge tag 'v4.15-rc8' into drm-next (diff) | |
download | linux-54156da8937c9f5f84b4215e239a61ecc7c29275.tar.xz linux-54156da8937c9f5f84b4215e239a61ecc7c29275.zip |
Merge airlied/drm-next into drm-misc-next
It's been a while since we've backmerged drm-next. Dave just brought
back 4.15-rc8, so now's a good time to freshen things up around here.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'Documentation/devicetree/bindings/net/mdio.txt')
-rw-r--r-- | Documentation/devicetree/bindings/net/mdio.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/net/mdio.txt b/Documentation/devicetree/bindings/net/mdio.txt index 96a53f89aa6e..e3e1603f256c 100644 --- a/Documentation/devicetree/bindings/net/mdio.txt +++ b/Documentation/devicetree/bindings/net/mdio.txt @@ -18,7 +18,7 @@ Example : This example shows these optional properties, plus other properties required for the TI Davinci MDIO driver. - davinci_mdio: ethernet@0x5c030000 { + davinci_mdio: ethernet@5c030000 { compatible = "ti,davinci_mdio"; reg = <0x5c030000 0x1000>; #address-cells = <1>; |