diff options
| author |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-23 18:50:59 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-23 18:50:59 +0000 |
| commit | 924ee2c9621b65df9dffa8218af5ee9a9b892bba (patch) | |
| tree | 316d72848181d4198dad3407ba5441083708ab7e /drivers/regulator/max8649.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-next (diff) | |
| parent | regulator: map consumer regulator based on device tree (diff) | |
| download | linux-dev-924ee2c9621b65df9dffa8218af5ee9a9b892bba.tar.xz linux-dev-924ee2c9621b65df9dffa8218af5ee9a9b892bba.zip | |
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, } info->regulator = regulator_register(&dcdc_desc, &client->dev, - pdata->regulator, info); + pdata->regulator, info, NULL); if (IS_ERR(info->regulator)) { dev_err(info->dev, "failed to register regulator %s\n", dcdc_desc.name); |