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/max8952.c | |
| parent | 68aaa37d0e8232d62a7e9411699e0dc005750186 (diff) | |
| parent | 69511a452e6dc6b74fe4f3671a51b1b44b9c57e3 (diff) | |
Merge remote-tracking branch 'regulator/topic/dt' into regulator-next
Diffstat (limited to 'drivers/regulator/max8952.c')
| -rw-r--r-- | drivers/regulator/max8952.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/max8952.c b/drivers/regulator/max8952.c index 3883d85c5b8..75d89400c12 100644 --- a/drivers/regulator/max8952.c +++ b/drivers/regulator/max8952.c @@ -208,7 +208,7 @@ static int __devinit max8952_pmic_probe(struct i2c_client *client, max8952->pdata = pdata; max8952->rdev = regulator_register(®ulator, max8952->dev, - &pdata->reg_data, max8952); + &pdata->reg_data, max8952, NULL); if (IS_ERR(max8952->rdev)) { ret = PTR_ERR(max8952->rdev); |