diff options
author | 2017-06-27 07:24:49 +1000 | |
---|---|---|
committer | 2017-06-27 08:28:30 +1000 | |
commit | 6d61e70ccc21606ffb8a0a03bd3aba24f659502b (patch) | |
tree | 69f5bfb29d085cc42839445d34170bd3ee4f7408 /Documentation/devicetree/bindings/mfd/stm32-timers.txt | |
parent | Merge tag 'hdlcd-for-v4.13-v3' of git://linux-arm.org/linux-ld into drm-next (diff) | |
parent | Linux 4.12-rc7 (diff) | |
download | linux-dev-6d61e70ccc21606ffb8a0a03bd3aba24f659502b.tar.xz linux-dev-6d61e70ccc21606ffb8a0a03bd3aba24f659502b.zip |
Backmerge tag 'v4.12-rc7' into drm-next
Linux 4.12-rc7
Needed at least rc6 for drm-misc-next-fixes, may as well go to rc7
Diffstat (limited to 'Documentation/devicetree/bindings/mfd/stm32-timers.txt')
-rw-r--r-- | Documentation/devicetree/bindings/mfd/stm32-timers.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/mfd/stm32-timers.txt b/Documentation/devicetree/bindings/mfd/stm32-timers.txt index bbd083f5600a..1db6e0057a63 100644 --- a/Documentation/devicetree/bindings/mfd/stm32-timers.txt +++ b/Documentation/devicetree/bindings/mfd/stm32-timers.txt @@ -31,7 +31,7 @@ Example: compatible = "st,stm32-timers"; reg = <0x40010000 0x400>; clocks = <&rcc 0 160>; - clock-names = "clk_int"; + clock-names = "int"; pwm { compatible = "st,stm32-pwm"; |