| Message ID | 1440706012-3334-1-git-send-email-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 0ba58de231066e47de87ccc4d61c5e396fe9bd27 |
| Headers | show |
On Thu, Aug 27, 2015 at 10:06:52PM +0200, Geert Uytterhoeven wrote: > Shmobile is all multiplatform these days, so get rid of the reference to > CONFIG_ARCH_SHMOBILE_MULTI. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > This must not be applied to a branch that still has > CONFIG_ARCH_SHMOBILE_LEGACY. > > drivers/sh/pm_runtime.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Thanks, I have queued this up for v4.4. -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/sh/pm_runtime.c b/drivers/sh/pm_runtime.c index 25abd4eb7d102113..91a003011acfacb2 100644 --- a/drivers/sh/pm_runtime.c +++ b/drivers/sh/pm_runtime.c @@ -34,7 +34,7 @@ static struct pm_clk_notifier_block platform_bus_notifier = { static int __init sh_pm_runtime_init(void) { - if (IS_ENABLED(CONFIG_ARCH_SHMOBILE_MULTI)) { + if (IS_ENABLED(CONFIG_ARCH_SHMOBILE)) { if (!of_find_compatible_node(NULL, NULL, "renesas,cpg-mstp-clocks")) return 0;
Shmobile is all multiplatform these days, so get rid of the reference to CONFIG_ARCH_SHMOBILE_MULTI. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- This must not be applied to a branch that still has CONFIG_ARCH_SHMOBILE_LEGACY. drivers/sh/pm_runtime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)