diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-07-03 16:08:30 +0200 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2014-07-06 16:31:56 +0200 |
| commit | d358c99838f3cf63ad7536124be4318cc84b11fa (patch) | |
| tree | 5bba146a2a0372ae580a7389c89eba7bd97d5db5 | |
| parent | bfe4cfa8ae21628267f2b879b4396ee17ea4fd3a (diff) | |
| download | op-kernel-dev-d358c99838f3cf63ad7536124be4318cc84b11fa.zip op-kernel-dev-d358c99838f3cf63ad7536124be4318cc84b11fa.tar.gz | |
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 <arnd@arndb.de>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
| -rw-r--r-- | arch/arm/mach-shmobile/platsmp-apmu.c | 2 |
1 files changed, 0 insertions, 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 |
