Change regmap to regmap_pmic. This is needed for commit 3e1e4a5f3a324502c27c4e8808e06ac2ea842360 ("mfd/rtc: s5m: fix register updating by adding regmap for RTC") to rename regmap to regmap_pmic in include/linux/mfd/samsung/core.h.
Signed-off-by: Stephen Engelman <stephen.engel...@gmail.com> Cc: Krzysztof Kozlowski <k.kozlow...@samsung.com> Cc: Sangbeom Kim <sbki...@samsung.com> Cc: Kyungmin Park <kyungmin.p...@samsung.com> Cc: Mark Brown <broo...@kernel.org> --- drivers/regulator/s2mps11.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c index 333677d..9e61922 100644 --- a/drivers/regulator/s2mps11.c +++ b/drivers/regulator/s2mps11.c @@ -438,7 +438,7 @@ common_reg: platform_set_drvdata(pdev, s2mps11); config.dev = &pdev->dev; - config.regmap = iodev->regmap; + config.regmap = iodev->regmap_pmic; config.driver_data = s2mps11; for (i = 0; i < S2MPS11_REGULATOR_MAX; i++) { if (!reg_np) { -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/