diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-18 18:24:24 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-18 18:24:41 +0100 |
| commit | d1c8b1bd093cb57860fb6446e096e1c1cda92d4d (patch) | |
| tree | 9c93ddf1ced6064a7f75a3f8a3691d09e624edb9 /drivers/regulator/s5m8767.c | |
| parent | regulator: s5m8767: Do not use sec_reg* regmap helpers (diff) | |
| parent | mfd: s2mps11: Fix build after regmap field rename in sec-core.c (diff) | |
| download | linux-d1c8b1bd093cb57860fb6446e096e1c1cda92d4d.tar.xz linux-d1c8b1bd093cb57860fb6446e096e1c1cda92d4d.zip | |
Merge tag 's2mps11-build' into regulator-s5m8767 since a following patch
depend on it.
regulator/clk: Fix s2mps11 build
This patch fixes a build failure that appeared in v3.13-rc4 due to an
RTC/MFD update merged via -mm.
Diffstat (limited to 'drivers/regulator/s5m8767.c')
| -rw-r--r-- | drivers/regulator/s5m8767.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c index 850473a96dd0..d7164bb75d3e 100644 --- a/drivers/regulator/s5m8767.c +++ b/drivers/regulator/s5m8767.c @@ -938,7 +938,7 @@ static int s5m8767_pmic_probe(struct platform_device *pdev) config.dev = s5m8767->dev; config.init_data = pdata->regulators[i].initdata; config.driver_data = s5m8767; - config.regmap = iodev->regmap; + config.regmap = iodev->regmap_pmic; config.of_node = pdata->regulators[i].reg_node; rdev[i] = devm_regulator_register(&pdev->dev, ®ulators[id], |