Skip to content

Commit

Permalink
Merge tag 'renesas-sh-drivers-fixes-for-v4.5' of git://git.kernel.org…
Browse files Browse the repository at this point in the history
…/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
  • Loading branch information
Linus Torvalds committed Feb 26, 2016
2 parents 9aca90a + 0378ba4 commit 5882c16
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/sh/pm_runtime.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 5882c16

Please sign in to comment.