Subject: [alternative-merged] mfd-rtc-fix-for-previous-rtc-fix.patch removed from -mm tree To: sfr@xxxxxxxxxxxxxxxx,broonie@xxxxxxxxxx,k.kozlowski@xxxxxxxxxxx,kyungmin.park@xxxxxxxxxxx,sbkim73@xxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Mon, 16 Dec 2013 16:46:26 -0800 The patch titled Subject: mfd/rtc: fix for previous RTC fix has been removed from the -mm tree. Its filename was mfd-rtc-fix-for-previous-rtc-fix.patch This patch was dropped because an alternative patch was merged ------------------------------------------------------ From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Subject: 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 <sfr@xxxxxxxxxxxxxxxx> Cc: Krzysztof Kozlowski <k.kozlowski@xxxxxxxxxxx> Cc: Kyungmin Park <kyungmin.park@xxxxxxxxxxx> Cc: Mark Brown <broonie@xxxxxxxxxx> Cc: Sangbeom Kim <sbkim73@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/regulator/s2mps11.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/regulator/s2mps11.c~mfd-rtc-fix-for-previous-rtc-fix drivers/regulator/s2mps11.c --- a/drivers/regulator/s2mps11.c~mfd-rtc-fix-for-previous-rtc-fix +++ a/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) { _ Patches currently in -mm which might be from sfr@xxxxxxxxxxxxxxxx are linux-next.patch kernel-forkc-export-kernel_thread-to-modules.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html