diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-05 20:27:49 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-05 20:27:49 +0100 |
| commit | 2f288efd2f9dd04e9a601364153d465fdd9a49bb (patch) | |
| tree | f80da9df4079e98c0a83f511e353e98b36f82e53 /drivers/regulator/fixed.c | |
| parent | regulator: Allow regulators to register with no init_data (diff) | |
| parent | regulator: pass device_node to of_get_regulator_init_data() (diff) | |
| download | linux-2f288efd2f9dd04e9a601364153d465fdd9a49bb.tar.xz 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 'drivers/regulator/fixed.c')
| -rw-r--r-- | drivers/regulator/fixed.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c index 72abbf5507a6..a44a017c0864 100644 --- a/drivers/regulator/fixed.c +++ b/drivers/regulator/fixed.c @@ -64,7 +64,7 @@ of_get_fixed_voltage_config(struct device *dev) if (!config) return NULL; - config->init_data = of_get_regulator_init_data(dev); + config->init_data = of_get_regulator_init_data(dev, dev->of_node); if (!config->init_data) return NULL; |