aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2012-07-11 16:55:12 -0400
committerRafael J. Wysocki <rjw@sisk.pl>2012-07-11 16:55:12 -0400
commit911a472aca3dac8aede558760a85ae051966dda0 (patch)
tree86053b2f49c457f136cbb70b0267ff9cca22d0fe
parenta1ee61b8f4b56e5e6ced16b83d5098e0f4238a45 (diff)
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>
-rw-r--r--arch/arm/mach-shmobile/pm-sh7372.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/pm-sh7372.c b/arch/arm/mach-shmobile/pm-sh7372.c
index 6a23e7c449ea..792037069226 100644
--- a/arch/arm/mach-shmobile/pm-sh7372.c
+++ b/arch/arm/mach-shmobile/pm-sh7372.c
@@ -303,6 +303,7 @@ static void sh7372_enter_a3sm_common(int pllc0_on)
303 sh7372_set_reset_vector(__pa(sh7372_resume_core_standby_sysc)); 303 sh7372_set_reset_vector(__pa(sh7372_resume_core_standby_sysc));
304 sh7372_enter_sysc(pllc0_on, 1 << 12); 304 sh7372_enter_sysc(pllc0_on, 1 << 12);
305} 305}
306#endif /* CONFIG_SUSPEND || CONFIG_CPU_IDLE */
306 307
307#ifdef CONFIG_CPU_IDLE 308#ifdef CONFIG_CPU_IDLE
308static int sh7372_do_idle_core_standby(unsigned long unused) 309static int sh7372_do_idle_core_standby(unsigned long unused)
@@ -442,7 +443,6 @@ static void sh7372_suspend_init(void)
442#else 443#else
443static void sh7372_suspend_init(void) {} 444static void sh7372_suspend_init(void) {}
444#endif 445#endif
445#endif /* CONFIG_SUSPEND || CONFIG_CPU_IDLE */
446 446
447void __init sh7372_pm_init(void) 447void __init sh7372_pm_init(void)
448{ 448{