git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
[pandora-kernel.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
a647693
..
324d25a
100644
(file)
--- a/
arch/arm/mach-pxa/mioa701_bootresume.S
+++ b/
arch/arm/mach-pxa/mioa701_bootresume.S
@@
-24,6
+24,7
@@
ENTRY(mioa701_jumpaddr)
1:
mov r0, #0xa0000000 @ Don't suppose memory access works
orr r0, r0, #0x00200000 @ even if it's supposed to
+ orr r0, r0, #0x0000b000
mov r1, #0
str r1, [r0] @ Early disable resume for next boot
ldr r0, mioa701_jumpaddr @ (Murphy's Law)