[PATCH] ARM: shmobile: fix shmobile_smp_apmu_suspend_init build failure for !SUSPEND
Simon Horman
horms+renesas at verge.net.au
Tue Jul 8 02:34:16 PDT 2014
From: Arnd Bergmann <arnd at arndb.de>
Patch d6d757c9a4e ("ARM: shmobile: APMU: Add Core-Standby-state for
Suspend to RAM") added both an inline wrapper for shmobile_smp_apmu_suspend_init
and an empty function in arch/arm/mach-shmobile/platsmp-apmu.c. We get a
build failure when both are present, so this patch removes the one in the .c
file and keeps the inline version.
Signed-off-by: Arnd Bergmann <arnd at arndb.de>
Signed-off-by: Simon Horman <horms+renesas at verge.net.au>
---
arch/arm/mach-shmobile/platsmp-apmu.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/mach-shmobile/platsmp-apmu.c b/arch/arm/mach-shmobile/platsmp-apmu.c
index a05b16d..2c06810 100644
--- a/arch/arm/mach-shmobile/platsmp-apmu.c
+++ b/arch/arm/mach-shmobile/platsmp-apmu.c
@@ -244,6 +244,4 @@ void __init shmobile_smp_apmu_suspend_init(void)
{
shmobile_suspend_ops.enter = shmobile_smp_apmu_enter_suspend;
}
-#else
-void shmobile_smp_apmu_suspend_init(void) {}
#endif
--
2.0.0.rc2
More information about the linux-arm-kernel
mailing list