---

yaml --- r: 140243 b: refs/heads/master c: bcf3402 h: refs/heads/master i: 140241: 8489698 140239: 0f2aa6e v: v3
git-mirror · Mar 31, 2009 · 6e3b5dd · 6e3b5dd
1 parent 3b7a643
commit 6e3b5dd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93c62da23a717f59933ec799688da42f71d8c6c4
+refs/heads/master: bcf3402c50a48d51462f37f72129d9c4369702b4
diff --git a/trunk/drivers/regulator/fixed.c b/trunk/drivers/regulator/fixed.c
@@ -73,7 +73,8 @@ static int regulator_fixed_voltage_probe(struct platform_device *pdev)
 
 	drvdata->microvolts = config->microvolts;
 
-	drvdata->dev = regulator_register(&drvdata->desc, drvdata);
+	drvdata->dev = regulator_register(&drvdata->desc, &pdev->dev,
+					  config->init_data, drvdata);
 	if (IS_ERR(drvdata->dev)) {
 		ret = PTR_ERR(drvdata->dev);
 		goto err_name;

diff --git a/trunk/include/linux/regulator/fixed.h b/trunk/include/linux/regulator/fixed.h
@@ -14,9 +14,12 @@
 #ifndef __REGULATOR_FIXED_H
 #define __REGULATOR_FIXED_H
 
+struct regulator_init_data;
+
 struct fixed_voltage_config {
 	const char *supply_name;
 	int microvolts;
+	struct regulator_init_data *init_data;
 };
 
 #endif