From fefdced9239cb97bf8758ff10dbdb65530909531 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Wed, 11 Jul 2012 22:55:12 +0200 Subject: [PATCH] --- yaml --- r: 319283 b: refs/heads/master c: 911a472aca3dac8aede558760a85ae051966dda0 h: refs/heads/master i: 319281: 80045ca5874bbb6f15be90eeda8e60407dd11cad 319279: 384e53bfebfa54ec89a69892f4132acb01675ab9 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-shmobile/pm-sh7372.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c0179d17f90d..8b33b7335e44 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1ee61b8f4b56e5e6ced16b83d5098e0f4238a45 +refs/heads/master: 911a472aca3dac8aede558760a85ae051966dda0 diff --git a/trunk/arch/arm/mach-shmobile/pm-sh7372.c b/trunk/arch/arm/mach-shmobile/pm-sh7372.c index 6a23e7c449ea..792037069226 100644 --- a/trunk/arch/arm/mach-shmobile/pm-sh7372.c +++ b/trunk/arch/arm/mach-shmobile/pm-sh7372.c @@ -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) {