Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[firefly-linux-kernel-4.4.55.git] / Documentation / DocBook / regulator.tmpl

diff --git a/Documentation/DocBook/regulator.tmpl b/Documentation/DocBook/regulator.tmpl
index 53f4f8d3b81038e8642d99507bf7d97a562a661c..346e552fa2cc64b4458f654f8ade9dca9564171d 100644 (file)
--- a/Documentation/DocBook/regulator.tmpl
+++ b/Documentation/DocBook/regulator.tmpl
@@ -267,8 +267,8 @@
      <sect1 id="machine-constraint">
        <title>Constraints</title>
        <para>
-        As well as definining the connections the machine interface
-        also provides constraints definining the operations that
+        As well as defining the connections the machine interface
+        also provides constraints defining the operations that
         clients are allowed to perform and the parameters that may be
         set.  This is required since generally regulator devices will
         offer more flexibility than it is safe to use on a given