From 6e3b5dd886187b87a76d8bc45d00b5ad39a65bc3 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Mon, 19 Jan 2009 13:37:04 +0000 Subject: [PATCH] --- yaml --- r: 140243 b: refs/heads/master c: bcf3402c50a48d51462f37f72129d9c4369702b4 h: refs/heads/master i: 140241: 8489698dcecbe30313737696fab1980a1b3017c2 140239: 0f2aa6e25de6fe8595bef17a16cc16e2f5fad3e0 v: v3 --- [refs] | 2 +- trunk/drivers/regulator/fixed.c | 3 ++- trunk/include/linux/regulator/fixed.h | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 849af6f4a7c8..0a18e44e1cda 100644 --- 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 index d31db3e14913..23d554628a76 100644 --- 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 index 1387a5d2190e..91b4da31f1b5 100644 --- 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