diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 18:32:13 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 18:32:13 -0400 |
| commit | a84bd2ee81ea1bdbd238cd1c380ec25f50a876c5 (patch) | |
| tree | ba054d4b1a20dadec088fd4d8983fb5939227e46 /Documentation/DocBook/regulator.tmpl | |
| parent | aec995900fbc8cffa9f0f9e797ef07a0beb2b079 (diff) | |
| parent | 7db6a7fa09884b34d2a5d4e6e4ed58664a5f0cf8 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes
Diffstat (limited to 'Documentation/DocBook/regulator.tmpl')
| -rw-r--r-- | Documentation/DocBook/regulator.tmpl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/DocBook/regulator.tmpl b/Documentation/DocBook/regulator.tmpl index 53f4f8d3b810..346e552fa2cc 100644 --- a/Documentation/DocBook/regulator.tmpl +++ b/Documentation/DocBook/regulator.tmpl | |||
| @@ -267,8 +267,8 @@ | |||
| 267 | <sect1 id="machine-constraint"> | 267 | <sect1 id="machine-constraint"> |
| 268 | <title>Constraints</title> | 268 | <title>Constraints</title> |
| 269 | <para> | 269 | <para> |
| 270 | As well as definining the connections the machine interface | 270 | As well as defining the connections the machine interface |
| 271 | also provides constraints definining the operations that | 271 | also provides constraints defining the operations that |
| 272 | clients are allowed to perform and the parameters that may be | 272 | clients are allowed to perform and the parameters that may be |
| 273 | set. This is required since generally regulator devices will | 273 | set. This is required since generally regulator devices will |
| 274 | offer more flexibility than it is safe to use on a given | 274 | offer more flexibility than it is safe to use on a given |