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 tag 'selinux-pr-20170831' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
thermal
/
armada-thermal.txt
diff --git
a/Documentation/devicetree/bindings/thermal/armada-thermal.txt
b/Documentation/devicetree/bindings/thermal/armada-thermal.txt
index 4698e0edc205d92491ecbd00b56c1281db7ae05b..24aacf8948c51626a22d844ddd95f752da4206f3 100644
(file)
--- a/
Documentation/devicetree/bindings/thermal/armada-thermal.txt
+++ b/
Documentation/devicetree/bindings/thermal/armada-thermal.txt
@@
-20,5
+20,4
@@
Example:
compatible = "marvell,armada370-thermal";
reg = <0xd0018300 0x4
0xd0018304 0x4>;
- status = "okay";
};