Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6-omap-h63xx.git] / arch / arm / plat-s3c24xx / sleep.S

diff --git a/arch/arm/plat-s3c24xx/sleep.S b/arch/arm/plat-s3c24xx/sleep.S
index d47113bbc34cee98eb8895f0475d7a1c278f46bc..a646cbe8244cfdd73add087b1b68f91bb831e85a 100644 (file)
--- a/arch/arm/plat-s3c24xx/sleep.S
+++ b/arch/arm/plat-s3c24xx/sleep.S
@@ -96,6 +96,14 @@ resume_with_mmu:
 s3c2410_sleep_save_phys:
        .word   0
 
+
+       /* sleep magic, to allow the bootloader to check for an valid
+        * image to resume to. Must be the first word before the
+        * s3c2410_cpu_resume entry.
+       */
+
+       .word   0x2bedf00d
+
        /* s3c2410_cpu_resume
         *
         * resume code entry for bootloader to call