summaryrefslogtreecommitdiff
path: root/Documentation/devicetree/bindings/pinctrl/qcom,msm8960-pinctrl.txt
diff options
context:
space:
mode:
authorChris Zankel <chris@zankel.net>2014-12-16 07:09:06 +0300
committerChris Zankel <chris@zankel.net>2014-12-16 07:09:06 +0300
commit865566ed33f08637c3486b4d301e96a9064ad2eb (patch)
treedfa26622c8feaa57153d87d207133f01aff5858b /Documentation/devicetree/bindings/pinctrl/qcom,msm8960-pinctrl.txt
parentc0d7aa07504a8f4abd7b02b9144c4a92b7565f45 (diff)
parentb2776bf7149bddd1f4161f14f79520f17fc1d71d (diff)
downloadlinux-865566ed33f08637c3486b4d301e96a9064ad2eb.tar.xz
Merge tag 'v3.18' into for_next
Linux 3.18
Diffstat (limited to 'Documentation/devicetree/bindings/pinctrl/qcom,msm8960-pinctrl.txt')
-rw-r--r--Documentation/devicetree/bindings/pinctrl/qcom,msm8960-pinctrl.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,msm8960-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,msm8960-pinctrl.txt
index 93b7de91b9f6..eb8d8aa41f20 100644
--- a/Documentation/devicetree/bindings/pinctrl/qcom,msm8960-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/qcom,msm8960-pinctrl.txt
@@ -47,7 +47,7 @@ Please refer to pinctrl-bindings.txt in this directory for details of the
common pinctrl bindings used by client devices, including the meaning of the
phrase "pin configuration node".
-The pin configuration nodes act as a container for an abitrary number of
+The pin configuration nodes act as a container for an arbitrary number of
subnodes. Each of these subnodes represents some desired configuration for a
pin, a group, or a list of pins or groups. This configuration can include the
mux function to select on those pin(s)/group(s), and various pin configuration