X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=drivers%2Fsh%2Fpm_runtime.c;h=cd4c293f0dd0d375be6d6d815108aeb588304fec;hb=4b2f8838479eb2abe042e094f7d2cced6d5ea772;hp=f3ee439d6f0e23b41bd54b0ad1bbb7941ec4e505;hpb=104b61590dcd5f71ff518e2b820e1cdf9d0350f2;p=sfrench%2Fcifs-2.6.git 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") &&