diff options
author | Mark Brown <broonie@linaro.org> | 2014-01-15 11:46:35 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-01-15 11:46:35 +0000 |
commit | 598911b42c940158caa1169092a804903bde845e (patch) | |
tree | 15487a73d3854488ef679ee920c48fe1a90c28b3 /drivers/regulator/s5m8767.c | |
parent | 1eb72f0b98fe7ea1c4bb2e9e294a865b044b2a82 (diff) | |
parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) |
Merge tag 'v3.13-rc4' into regulator-pfuze100
Linux 3.13-rc4
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 cbf91e25cf7f..aeb40aad0ae7 100644 --- a/drivers/regulator/s5m8767.c +++ b/drivers/regulator/s5m8767.c @@ -925,7 +925,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], |