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 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer...
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
pinctrl
/
fsl,imx-pinctrl.txt
diff --git
a/Documentation/devicetree/bindings/pinctrl/fsl,imx-pinctrl.txt
b/Documentation/devicetree/bindings/pinctrl/fsl,imx-pinctrl.txt
index 9fde25f1401a55b64b8b3fa80f27f9310e7cb706..42d74f8a1bccfea6c2f701af9c9f63dad04e975f 100644
(file)
--- a/
Documentation/devicetree/bindings/pinctrl/fsl,imx-pinctrl.txt
+++ b/
Documentation/devicetree/bindings/pinctrl/fsl,imx-pinctrl.txt
@@
-61,7
+61,6
@@
Examples:
usdhc@0219c000 { /* uSDHC4 */
non-removable;
vmmc-supply = <®_3p3v>;
- status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc4_1>;
};