From 0a1061b67caad8e0b80f0f0cbe96b3e1f82d0544 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Wed, 8 May 2013 14:18:04 +0200 Subject: [PATCH] ARM: shmobile: fix sleep-r8a7740.S miscompiles The newly added sleep-r8a7740.S file in shmobile does not actually build because of renamed symbols. Signed-off-by: Arnd Bergmann Cc: Bastian Hecht Signed-off-by: Simon Horman --- arch/arm/mach-shmobile/sleep-r8a7740.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-shmobile/sleep-r8a7740.S b/arch/arm/mach-shmobile/sleep-r8a7740.S index 435531bd4155..982eacbfaa43 100644 --- a/arch/arm/mach-shmobile/sleep-r8a7740.S +++ b/arch/arm/mach-shmobile/sleep-r8a7740.S @@ -32,7 +32,7 @@ ENTRY(r8a7740_shutdown) wfi_loop: bl cpu_v7_do_idle b wfi_loop -ENDPROC(r8a7740) +ENDPROC(r8a7740_shutdown) .text ENTRY(v7_cpu_resume) @@ -53,5 +53,5 @@ ENDPROC(v7_cpu_resume) ENTRY(r8a7740_resume) ldr pc, 1f 1: .long v7_cpu_resume - PAGE_OFFSET + PLAT_PHYS_OFFSET -ENDPROC(r8a7740_resume_core_standby) +ENDPROC(r8a7740_resume) #endif -- 2.39.5