diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-23 13:50:59 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-23 13:50:59 -0500 |
| commit | 924ee2c9621b65df9dffa8218af5ee9a9b892bba (patch) | |
| tree | 316d72848181d4198dad3407ba5441083708ab7e /drivers/regulator/max8649.c | |
| parent | 68aaa37d0e8232d62a7e9411699e0dc005750186 (diff) | |
| parent | 69511a452e6dc6b74fe4f3671a51b1b44b9c57e3 (diff) | |
Merge remote-tracking branch 'regulator/topic/dt' into regulator-next
Diffstat (limited to 'drivers/regulator/max8649.c')
| -rw-r--r-- | drivers/regulator/max8649.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/max8649.c b/drivers/regulator/max8649.c index c54d0ad18c73..b06a2399587c 100644 --- a/drivers/regulator/max8649.c +++ b/drivers/regulator/max8649.c | |||
| @@ -299,7 +299,7 @@ static int __devinit max8649_regulator_probe(struct i2c_client *client, | |||
| 299 | } | 299 | } |
| 300 | 300 | ||
| 301 | info->regulator = regulator_register(&dcdc_desc, &client->dev, | 301 | info->regulator = regulator_register(&dcdc_desc, &client->dev, |
| 302 | pdata->regulator, info); | 302 | pdata->regulator, info, NULL); |
| 303 | if (IS_ERR(info->regulator)) { | 303 | if (IS_ERR(info->regulator)) { |
| 304 | dev_err(info->dev, "failed to register regulator %s\n", | 304 | dev_err(info->dev, "failed to register regulator %s\n", |
| 305 | dcdc_desc.name); | 305 | dcdc_desc.name); |