From: Arnd Bergmann Date: Thu, 3 Jul 2014 14:08:30 +0000 (+0200) Subject: ARM: shmobile: fix shmobile_smp_apmu_suspend_init build failure for !SUSPEND X-Git-Tag: firefly_0821_release~176^2~3447^2~26^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d358c99838f3cf63ad7536124be4318cc84b11fa;p=firefly-linux-kernel-4.4.55.git ARM: shmobile: fix shmobile_smp_apmu_suspend_init build failure for !SUSPEND 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 Signed-off-by: Simon Horman --- diff --git a/arch/arm/mach-shmobile/platsmp-apmu.c b/arch/arm/mach-shmobile/platsmp-apmu.c index a05b16d88257..2c06810d3a70 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