diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-27 16:08:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-27 16:08:45 -0800 |
| commit | 1c0705151e8efb186139c2a8f3e9d8ee8583a07f (patch) | |
| tree | 0fcaa3196d81748e2e45552e046a38682e075db2 | |
| parent | Merge tag 'hwmon-for-linus-v4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging (diff) | |
| parent | drivers: sh: Disable PM runtime for multi-platform r8a7740 with genpd (diff) | |
| download | wireguard-linux-1c0705151e8efb186139c2a8f3e9d8ee8583a07f.tar.xz wireguard-linux-1c0705151e8efb186139c2a8f3e9d8ee8583a07f.zip | |
Merge tag 'renesas-sh-drivers-for-v4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas
Pull SH driver fix from Simon Horman:
"Disable PM runtime for multi-platform r8a7740 with genpd"
* tag 'renesas-sh-drivers-for-v4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
drivers: sh: Disable PM runtime for multi-platform r8a7740 with genpd
Diffstat (limited to '')
| -rw-r--r-- | drivers/sh/pm_runtime.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/sh/pm_runtime.c b/drivers/sh/pm_runtime.c index f3ee439d6f0e..cd4c293f0dd0 100644 --- a/drivers/sh/pm_runtime.c +++ b/drivers/sh/pm_runtime.c @@ -81,7 +81,9 @@ static int __init sh_pm_runtime_init(void) if (!of_machine_is_compatible("renesas,emev2") && !of_machine_is_compatible("renesas,r7s72100") && !of_machine_is_compatible("renesas,r8a73a4") && +#ifndef CONFIG_PM_GENERIC_DOMAINS_OF !of_machine_is_compatible("renesas,r8a7740") && +#endif !of_machine_is_compatible("renesas,r8a7778") && !of_machine_is_compatible("renesas,r8a7779") && !of_machine_is_compatible("renesas,r8a7790") && |