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/bus/imx-weim.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/bus/imx-weim.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/bus/imx-weim.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/bus/imx-weim.txt b/Documentation/devicetree/bindings/bus/imx-weim.txt index 6630d842c7a3..683eaf3aed79 100644 --- a/Documentation/devicetree/bindings/bus/imx-weim.txt +++ b/Documentation/devicetree/bindings/bus/imx-weim.txt @@ -61,7 +61,7 @@ Timing property for child nodes. It is mandatory, not optional. Example for an imx6q-sabreauto board, the NOR flash connected to the WEIM: - weim: weim@021b8000 { + weim: weim@21b8000 { compatible = "fsl,imx6q-weim"; reg = <0x021b8000 0x4000>; clocks = <&clks 196>; |