| commit | f094c5346231e9237610f8f16f659fb972de1c60 | [log] [tgz] |
|---|---|---|
| author | Simon Horman <horms+renesas@verge.net.au> | Thu Mar 03 11:19:49 2016 +0900 |
| committer | Simon Horman <horms+renesas@verge.net.au> | Thu Mar 03 11:19:49 2016 +0900 |
| tree | c657e7b43d9bc0152cdf4c094ad3f0b6581ae501 | |
| parent | 0d621d6c4a42cdac021036c49b97e38b2aae28df [diff] | |
| parent | 5a346ca0ea354628e0a7d967212024129b95a19a [diff] |
Merge branch 'heads/sh-drivers-for-v4.6' into next
diff --git a/drivers/sh/pm_runtime.c b/drivers/sh/pm_runtime.c index a9bac3b..aa2ce22 100644 --- a/drivers/sh/pm_runtime.c +++ b/drivers/sh/pm_runtime.c
@@ -34,7 +34,7 @@ static int __init sh_pm_runtime_init(void) { - if (IS_ENABLED(CONFIG_OF) && IS_ENABLED(CONFIG_ARCH_SHMOBILE)) { + if (IS_ENABLED(CONFIG_ARCH_RENESAS)) { if (!of_find_compatible_node(NULL, NULL, "renesas,cpg-mstp-clocks")) return 0;