fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/arch/arm/mach-sa1100/sleep.S b/arch/arm/mach-sa1100/sleep.S
index 03b8af5..5a84062 100644 (file)
--- a/arch/arm/mach-sa1100/sleep.S
+++ b/arch/arm/mach-sa1100/sleep.S
@@ -70,12 +70,12 @@ ENTRY(sa1100_cpu_suspend)
        @ delay 90us and set CPU PLL to lowest speed
        @ fixes resume problem on high speed SA1110
        mov     r0, #90
-       bl      udelay
+       bl      __udelay
        ldr     r0, =PPCR
        mov     r1, #0
        str     r1, [r0]
        mov     r0, #90
-       bl      udelay
+       bl      __udelay
 
        /*
         * SA1110 SDRAM controller workaround.  register values:
@@ -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