Merge branch 'linus' into x86/kconfig

[linux-2.6-omap-h63xx.git] / arch / arm / mach-sa1100 / sleep.S

diff --git a/arch/arm/mach-sa1100/sleep.S b/arch/arm/mach-sa1100/sleep.S
index 2fa1e289d1776e470ec3c5e42509bc20a5c72c96..5a84062f92af903fb96c3ab043cd50ada1006ad7 100644 (file)
--- a/arch/arm/mach-sa1100/sleep.S
+++ b/arch/arm/mach-sa1100/sleep.S
@@ -177,7 +177,7 @@ sa1110_sdram_controller_fix:
        .data
        .align 5
 ENTRY(sa1100_cpu_resume)
-       mov     r0, #PSR_F_BIT | PSR_I_BIT | MODE_SVC
+       mov     r0, #PSR_F_BIT | PSR_I_BIT | SVC_MODE
        msr     cpsr_c, r0                      @ set SVC, irqs off
 
        ldr     r0, sleep_save_sp               @ stack phys addr