diff options
| author | Jens Axboe <axboe@fb.com> | 2014-09-22 21:57:32 +0400 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-09-22 21:57:32 +0400 |
| commit | 6d11fb454b161a4565c57be6f1c5527235741003 (patch) | |
| tree | c238ed3df2f654181c2a0746478a33b32214cc60 /Documentation/power/regulator/machine.txt | |
| parent | b207892b061da7608878e273ae22ba9bf9be264b (diff) | |
| parent | 8b95741569eabc5eb17da71d1d3668cdb0bef86c (diff) | |
| download | linux-6d11fb454b161a4565c57be6f1c5527235741003.tar.xz | |
Merge branch 'for-linus' into for-3.18/core
Moving patches from for-linus to 3.18 instead, pull in this changes
that will go to Linus today.
Diffstat (limited to 'Documentation/power/regulator/machine.txt')
| -rw-r--r-- | Documentation/power/regulator/machine.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/power/regulator/machine.txt b/Documentation/power/regulator/machine.txt index ce63af0a8e35..757e3b53dc11 100644 --- a/Documentation/power/regulator/machine.txt +++ b/Documentation/power/regulator/machine.txt @@ -11,7 +11,7 @@ Consider the following machine :- +-> [Consumer B @ 3.3V] The drivers for consumers A & B must be mapped to the correct regulator in -order to control their power supply. This mapping can be achieved in machine +order to control their power supplies. This mapping can be achieved in machine initialisation code by creating a struct regulator_consumer_supply for each regulator. @@ -39,7 +39,7 @@ to the 'Vcc' supply for Consumer A. Constraints can now be registered by defining a struct regulator_init_data for each regulator power domain. This structure also maps the consumers -to their supply regulator :- +to their supply regulators :- static struct regulator_init_data regulator1_data = { .constraints = { |