projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-spi
[oweals/u-boot.git]
/
arch
/
arm
/
lib
/
relocate.S
diff --git
a/arch/arm/lib/relocate.S
b/arch/arm/lib/relocate.S
index a62a55656128077890e23bb3ac170be0f464e6bf..803525156314e2b4b59a73d296965f773095041a 100644
(file)
--- a/
arch/arm/lib/relocate.S
+++ b/
arch/arm/lib/relocate.S
@@
-66,9
+66,9
@@
relocate_done:
/* ARMv4- don't know bx lr but the assembler fails to see that */
#ifdef __ARM_ARCH_4__
-
mov pc, lr
+ mov pc, lr
#else
-
bx lr
+ bx lr
#endif
ENDPROC(relocate_code)