Merge branch 's3c-move' into devel

[linux-2.6-omap-h63xx.git] / arch / arm / lib / copy_page.S

diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
index 68117968482bbe5f4c021732ba00624ee321ec54..6ae04db1ca4f2eb6b65732fd560798c3c8b63417 100644 (file)
--- a/arch/arm/lib/copy_page.S
+++ b/arch/arm/lib/copy_page.S
@@ -43,4 +43,5 @@ ENTRY(copy_page)
                bgt     1b                              @       1
        PLD(    ldmeqia r1!, {r3, r4, ip, lr}   )
        PLD(    beq     2b                      )
-               LOADREGS(fd, sp!, {r4, pc})             @       3
+               ldmfd   sp!, {r4, pc}                   @       3
+ENDPROC(copy_page)