Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / arch / arm / lib / ecard.S

diff --git a/arch/arm/lib/ecard.S b/arch/arm/lib/ecard.S
index fb7b602..c55aaa2 100644 (file)
--- a/arch/arm/lib/ecard.S
+++ b/arch/arm/lib/ecard.S
@@ -29,7 +29,7 @@ ENTRY(ecard_loader_read)
                CPSR2SPSR(r0)
                mov     lr, pc
                mov     pc, r2
-               LOADREGS(fd, sp!, {r4 - r12, pc})
+               ldmfd   sp!, {r4 - r12, pc}
 
 @ Purpose: call an expansion card loader to reset the card
 @ Proto  : void read_loader(int card_base, char *loader);
@@ -41,5 +41,5 @@ ENTRY(ecard_loader_reset)
                CPSR2SPSR(r0)
                mov     lr, pc
                add     pc, r1, #8
-               LOADREGS(fd, sp!, {r4 - r12, pc})
+               ldmfd   sp!, {r4 - r12, pc}