Merge remote-tracking branch 'regulator/topic/dt' into regulator-next

git-mirror · Nov 24, 2011 · 02fcc84 · 02fcc84
2 parents 924ee2c + 1568434
commit 02fcc84
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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);