Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6] / arch / arm / lib / memchr.S

diff --git a/arch/arm/lib/memchr.S b/arch/arm/lib/memchr.S
index ac34fe55d21a1d999141f8debf446989e68dffd8..e7ab1ea8ebaa5aa5bf5a213c2cefedfe3410b5b1 100644 (file)
--- a/arch/arm/lib/memchr.S
+++ b/arch/arm/lib/memchr.S
@@ -22,4 +22,4 @@ ENTRY(memchr)
        bne     1b
        sub     r0, r0, #1
 2:     movne   r0, #0
-       RETINSTR(mov,pc,lr)
+       mov     pc, lr