ARM: shmobile: fix shmobile_smp_apmu_suspend_init build failure for !SUSPEND
authorArnd Bergmann <arnd@arndb.de>
Thu, 3 Jul 2014 14:08:30 +0000 (16:08 +0200)
committerSimon Horman <horms@verge.net.au>
Fri, 5 Dec 2014 00:25:09 +0000 (09:25 +0900)
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@arndb.de>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit d358c99838f3cf63ad7536124be4318cc84b11fa)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
arch/arm/mach-shmobile/platsmp-apmu.c

index a05b16d..2c06810 100644 (file)
@@ -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