Commit 5882c169 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'renesas-sh-drivers-fixes-for-v4.5' of...

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
parents 9aca90a7 0378ba48
...@@ -34,7 +34,7 @@ static struct pm_clk_notifier_block platform_bus_notifier = { ...@@ -34,7 +34,7 @@ static struct pm_clk_notifier_block platform_bus_notifier = {
static int __init sh_pm_runtime_init(void) 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, if (!of_find_compatible_node(NULL, NULL,
"renesas,cpg-mstp-clocks")) "renesas,cpg-mstp-clocks"))
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment