Merge tag 'renesas-sh-drivers-fixes-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

torvalds · torvalds · commit 5882c169be18 · 2016-02-25T19:47:01.000-08:00
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
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ static struct pm_clk_notifier_block platform_bus_notifier = {`
`34`	`34`
`35`	`35`	`static int __init sh_pm_runtime_init(void)`
`36`	`36`	`{`
`37`		`- if (IS_ENABLED(CONFIG_ARCH_SHMOBILE)) {`
	`37`	`+ if (IS_ENABLED(CONFIG_OF) && IS_ENABLED(CONFIG_ARCH_SHMOBILE)) {`
`38`	`38`	`if (!of_find_compatible_node(NULL, NULL,`
`39`	`39`	`"renesas,cpg-mstp-clocks"))`
`40`	`40`	`return 0;`