diff options
| author | Mark Brown <broonie@kernel.org> | 2015-03-11 12:53:25 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-11 12:53:25 +0000 |
| commit | 11dd60447e3b1018f9cae66737cb902b519d3454 (patch) | |
| tree | a33d8bcb18a3becae2161aa215c25d5674626c57 /drivers/sh/pm_runtime.c | |
| parent | 8d0c38a3f2a6bb70e952f127ed817fc7a08db52c (diff) | |
| parent | 9eccca0843205f87c00404b663188b88eb248051 (diff) | |
Merge tag 'v4.0-rc3' into asoc-intel
Linux 4.0-rc3
Diffstat (limited to 'drivers/sh/pm_runtime.c')
| -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") && |