aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-02-25 19:47:01 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-02-25 19:47:01 -0800
commit5882c169be18e42b855443574f8e95215f7ba461 (patch)
treeeee78ac580ed86948b60bf90d560cb8abfa87294
parent9aca90a7ca911af4da5d77fad11f54f040dc027d (diff)
parent0378ba4899d5fbd8494ed6580cbc81d7b44dbac6 (diff)
downloadlinux-stericsson-5882c169be18e42b855443574f8e95215f7ba461.tar.gz
Merge tag 'renesas-sh-drivers-fixes-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas
Pull SuperH driver fix from Simon Horman: "Restore legacy clock domain on SuperH platforms" * tag 'renesas-sh-drivers-fixes-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: drivers: sh: Restore legacy clock domain on SuperH platforms
-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 91a003011acf..a9bac3bf20de 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)) {
+ if (IS_ENABLED(CONFIG_OF) && IS_ENABLED(CONFIG_ARCH_SHMOBILE)) {
if (!of_find_compatible_node(NULL, NULL,
"renesas,cpg-mstp-clocks"))
return 0;