projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
[cascardo/linux.git]
/
arch
/
arm
/
mach-pxa
/
mioa701_bootresume.S
diff --git
a/arch/arm/mach-pxa/mioa701_bootresume.S
b/arch/arm/mach-pxa/mioa701_bootresume.S
index
324d25a
..
8159149
100644
(file)
--- a/
arch/arm/mach-pxa/mioa701_bootresume.S
+++ b/
arch/arm/mach-pxa/mioa701_bootresume.S
@@
-29,7
+29,7
@@
ENTRY(mioa701_jumpaddr)
str r1, [r0] @ Early disable resume for next boot
ldr r0, mioa701_jumpaddr @ (Murphy's Law)
ldr r0, [r0]
-
mov pc,
r0
+
ret
r0
2:
ENTRY(mioa701_bootstrap_lg)