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 branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
input
/
touchscreen
/
imx6ul_tsc.txt
diff --git
a/Documentation/devicetree/bindings/input/touchscreen/imx6ul_tsc.txt
b/Documentation/devicetree/bindings/input/touchscreen/imx6ul_tsc.txt
index d4927c202aef271554022e5fd84451f1febe9212..e67e58b61706243153a2a70ebc5f4cc8cf66b643 100644
(file)
--- a/
Documentation/devicetree/bindings/input/touchscreen/imx6ul_tsc.txt
+++ b/
Documentation/devicetree/bindings/input/touchscreen/imx6ul_tsc.txt
@@
-35,5
+35,4
@@
Example:
measure-delay-time = <0xfff>;
pre-charge-time = <0xffff>;
touchscreen-average-samples = <32>;
- status = "okay";
};