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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
mfd
/
mc13xxx.txt
diff --git
a/Documentation/devicetree/bindings/mfd/mc13xxx.txt
b/Documentation/devicetree/bindings/mfd/mc13xxx.txt
index 39ba4146769deb9ab3549a0789bbb340e693e7ca..ac235fe385fc296e371fab835170c9e0b14a7ae1 100644
(file)
--- a/
Documentation/devicetree/bindings/mfd/mc13xxx.txt
+++ b/
Documentation/devicetree/bindings/mfd/mc13xxx.txt
@@
-113,7
+113,6
@@
MC13892 regulators:
Examples:
ecspi@70010000 { /* ECSPI1 */
- fsl,spi-num-chipselects = <2>;
cs-gpios = <&gpio4 24 0>, /* GPIO4_24 */
<&gpio4 25 0>; /* GPIO4_25 */