diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-23 19:50:59 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-23 19:50:59 +0100 |
| commit | 924ee2c9621b65df9dffa8218af5ee9a9b892bba (patch) | |
| tree | 316d72848181d4198dad3407ba5441083708ab7e /drivers/regulator/tps65910-regulator.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bro... (diff) | |
| parent | regulator: map consumer regulator based on device tree (diff) | |
| download | linux-924ee2c9621b65df9dffa8218af5ee9a9b892bba.tar.xz linux-924ee2c9621b65df9dffa8218af5ee9a9b892bba.zip | |
Merge remote-tracking branch 'regulator/topic/dt' into regulator-next
Diffstat (limited to 'drivers/regulator/tps65910-regulator.c')
| -rw-r--r-- | drivers/regulator/tps65910-regulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c index bb2a08d4e93e..5c15ba01e9c7 100644 --- a/drivers/regulator/tps65910-regulator.c +++ b/drivers/regulator/tps65910-regulator.c @@ -948,7 +948,7 @@ static __devinit int tps65910_probe(struct platform_device *pdev) pmic->desc[i].owner = THIS_MODULE; rdev = regulator_register(&pmic->desc[i], - tps65910->dev, reg_data, pmic); + tps65910->dev, reg_data, pmic, NULL); if (IS_ERR(rdev)) { dev_err(tps65910->dev, "failed to register %s regulator\n", |