Hi all, After merging the final tree, today's linux-next build (powerpc allyesconfig) failed like this: drivers/regulator/s2mps11.c: In function 's2mps11_pmic_probe': drivers/regulator/s2mps11.c:441:23: error: 'struct sec_pmic_dev' has no member named 'regmap' config.regmap = iodev->regmap; ^ Caused by commit 3e1e4a5f3a32 ("mfd/rtc: s5m: fix register updating by adding regmap for RTC") from Linus' tree. Grep is your friend ... I have added the following fix patch for today: From: Stephen Rothwell Date: Mon, 16 Dec 2013 16:43:02 +1100 Subject: [PATCH] mfd/rtc: fix for previous RTC fix This updates drivers/regulator/s2mps11.c for the changes in commit 3e1e4a5f3a32 ("mfd/rtc: s5m: fix register updating by adding regmap for RTC"). Signed-off-by: Stephen Rothwell --- 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 333677d68d0e..9e61922d8230 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) { -- 1.8.5.1 -- Cheers, Stephen Rothwell