forked from luck/tmp_suning_uos_patched
ARM: shmobile: Fix build problem in pm-sh7372.c for unusual .config
If neither CONFIG_SUSPEND nor CONFIG_CPU_IDLE is set in the kernel configuration file, build error occurs in arch/arm/mach-shmobile/pm-sh7372.c. Fix it by rearranging #ifdefs in that file to make the definition of sh7372_suspend_init() depend only on CONFIG_SUSPEND and the definition of sh7372_cpuidle_init() depend only on CONFIG_CPU_IDLE. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Magnus Damm <damm@opensource.se>
This commit is contained in:
parent
a1ee61b8f4
commit
911a472aca
|
@ -303,6 +303,7 @@ static void sh7372_enter_a3sm_common(int pllc0_on)
|
|||
sh7372_set_reset_vector(__pa(sh7372_resume_core_standby_sysc));
|
||||
sh7372_enter_sysc(pllc0_on, 1 << 12);
|
||||
}
|
||||
#endif /* CONFIG_SUSPEND || CONFIG_CPU_IDLE */
|
||||
|
||||
#ifdef CONFIG_CPU_IDLE
|
||||
static int sh7372_do_idle_core_standby(unsigned long unused)
|
||||
|
@ -442,7 +443,6 @@ static void sh7372_suspend_init(void)
|
|||
#else
|
||||
static void sh7372_suspend_init(void) {}
|
||||
#endif
|
||||
#endif /* CONFIG_SUSPEND || CONFIG_CPU_IDLE */
|
||||
|
||||
void __init sh7372_pm_init(void)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue
Block a user