diff options
author | Mark Brown | 2011-12-05 20:27:49 +0100 |
---|---|---|
committer | Mark Brown | 2011-12-05 20:27:49 +0100 |
commit | 2f288efd2f9dd04e9a601364153d465fdd9a49bb (patch) | |
tree | f80da9df4079e98c0a83f511e353e98b36f82e53 /Documentation | |
parent | regulator: Allow regulators to register with no init_data (diff) | |
parent | regulator: pass device_node to of_get_regulator_init_data() (diff) | |
download | kernel-qcow2-linux-2f288efd2f9dd04e9a601364153d465fdd9a49bb.tar.gz kernel-qcow2-linux-2f288efd2f9dd04e9a601364153d465fdd9a49bb.tar.xz kernel-qcow2-linux-2f288efd2f9dd04e9a601364153d465fdd9a49bb.zip |
Merge branch 'topic/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-next
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/power/regulator/regulator.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/power/regulator/regulator.txt b/Documentation/power/regulator/regulator.txt index 3f8b528f237e..e272d9909e39 100644 --- a/Documentation/power/regulator/regulator.txt +++ b/Documentation/power/regulator/regulator.txt @@ -12,7 +12,7 @@ Drivers can register a regulator by calling :- struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc, struct device *dev, struct regulator_init_data *init_data, - void *driver_data); + void *driver_data, struct device_node *of_node); This will register the regulators capabilities and operations to the regulator core. |