aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/sh/pm_runtime.c
diff options
context:
space:
mode:
authorLinus Walleij <[email protected]>2015-12-21 08:36:21 +0000
committerLinus Walleij <[email protected]>2015-12-21 08:36:21 +0000
commit0529357f102b96f68bc199f858d1c3b07f4b674c (patch)
treeeaa047952a768099e00a5245afa0d84799df6990 /drivers/sh/pm_runtime.c
parentgpio: pch: fix non-DT build (diff)
parentLinux 4.4-rc6 (diff)
downloadkernel-0529357f102b96f68bc199f858d1c3b07f4b674c.tar.gz
kernel-0529357f102b96f68bc199f858d1c3b07f4b674c.zip
Merge tag 'v4.4-rc6' into devel
Linux 4.4-rc6
Diffstat (limited to 'drivers/sh/pm_runtime.c')
-rw-r--r--drivers/sh/pm_runtime.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/sh/pm_runtime.c b/drivers/sh/pm_runtime.c
index 25abd4eb7d10..91a003011acf 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;