diff options
| author |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-05 19:27:49 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-05 19:27:49 +0000 |
| commit | 2f288efd2f9dd04e9a601364153d465fdd9a49bb (patch) | |
| tree | f80da9df4079e98c0a83f511e353e98b36f82e53 /include/linux | |
| parent | regulator: Allow regulators to register with no init_data (diff) | |
| parent | regulator: pass device_node to of_get_regulator_init_data() (diff) | |
Merge branch 'topic/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-next
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/regulator/of_regulator.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/regulator/of_regulator.h b/include/linux/regulator/of_regulator.h index d83a98d3e3fd..769704f296e5 100644 --- a/include/linux/regulator/of_regulator.h +++ b/include/linux/regulator/of_regulator.h @@ -8,10 +8,12 @@ #if defined(CONFIG_OF) extern struct regulator_init_data - *of_get_regulator_init_data(struct device *dev); + *of_get_regulator_init_data(struct device *dev, + struct device_node *node); #else static inline struct regulator_init_data - *of_get_regulator_init_data(struct device *dev) + *of_get_regulator_init_data(struct device *dev, + struct device_node *node) { return NULL; } |