Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[pandora-kernel.git] / arch / arm / mach-s3c64xx / sleep.S

diff --git a/arch/arm/mach-s3c64xx/sleep.S b/arch/arm/mach-s3c64xx/sleep.S
index dc4f582..34313f9 100644 (file)
--- a/arch/arm/mach-s3c64xx/sleep.S
+++ b/arch/arm/mach-s3c64xx/sleep.S
@@ -25,26 +25,6 @@
 
        .text
 
-       /* s3c_cpu_save
-        *
-        * Save enough processor state to allow the restart of the pm.c
-        * code after resume.
-        *
-        * entry:
-        *      r1 = v:p offset
-       */
-
-ENTRY(s3c_cpu_save)
-       stmfd   sp!, { r4 - r12, lr }
-       adr     r3, BSYM(s3c64xx_finish_suspend)
-       bl      cpu_suspend
-       ldmfd   sp!, { r4 - r12, pc }
-
-s3c64xx_finish_suspend:
-       @@ call final suspend code
-       ldr     r0, =pm_cpu_sleep
-       ldr     pc, [r0]
-       
        /* Sleep magic, the word before the resume entry point so that the
         * bootloader can check for a resumeable image. */