git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'spi/fix/atmel', 'spi/fix/bcm63xx', 'spi/fix/doc'...
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
mfd
/
stm32-timers.txt
diff --git
a/Documentation/devicetree/bindings/mfd/stm32-timers.txt
b/Documentation/devicetree/bindings/mfd/stm32-timers.txt
index bbd083f5600a786b23a0ec821f384e8e8a6a3553..1db6e0057a638e09a5346956a70620c31276fdf6 100644
(file)
--- 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";