summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-24 10:49:38 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-24 10:49:38 +0000
commit02fcc84ae551d27c0ef2ee043881cc2afc8f892d (patch)
tree49a8842445434134d06cf1898bbd7fb3c99f18f8
parent924ee2c9621b65df9dffa8218af5ee9a9b892bba (diff)
parent156843470c4b9ea9698cc245d2cff769b3784088 (diff)
Merge remote-tracking branch 'regulator/topic/dt' into regulator-next
-rw-r--r--drivers/regulator/gpio-regulator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c
index f0acf52498b..42e1cb1835e 100644
--- a/drivers/regulator/gpio-regulator.c
+++ b/drivers/regulator/gpio-regulator.c
@@ -284,7 +284,7 @@ static int __devinit gpio_regulator_probe(struct platform_device *pdev)
drvdata->state = state;
drvdata->dev = regulator_register(&drvdata->desc, &pdev->dev,
- config->init_data, drvdata);
+ config->init_data, drvdata, NULL);
if (IS_ERR(drvdata->dev)) {
ret = PTR_ERR(drvdata->dev);
dev_err(&pdev->dev, "Failed to register regulator: %d\n", ret);