diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-11-25 23:47:38 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-11-25 23:47:38 +0100 |
| commit | d3de94ba4e58e8043d500f7335797d6a2ac93248 (patch) | |
| tree | 8382a170965eec00ebfe62e7b42dfdea9ca44f54 /drivers/sh/pm_runtime.c | |
| parent | fabc2c9c1ff5376489e83e142f1ab236609435b1 (diff) | |
| parent | 1ec218373b8ebda821aec00bb156a9c94fad9cd4 (diff) | |
Merge tag 'v4.4-rc2' into fixes
Linux 4.4-rc2 is backmerged from the keystone fixes.
Diffstat (limited to 'drivers/sh/pm_runtime.c')
| -rw-r--r-- | drivers/sh/pm_runtime.c | 2 |
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; |