summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/fixed.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-05 19:27:49 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-05 19:27:49 +0000
commit2f288efd2f9dd04e9a601364153d465fdd9a49bb (patch)
treef80da9df4079e98c0a83f511e353e98b36f82e53 /drivers/regulator/fixed.c
parent9a8f5e07200dd80fe5979490c36b62f64f70825b (diff)
parentd9a861cce10596ae1f10cffefe1ad4519a253475 (diff)
downloadblackbird-op-linux-2f288efd2f9dd04e9a601364153d465fdd9a49bb.tar.gz
blackbird-op-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.c2
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;
OpenPOWER on IntegriCloud