diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-12-08 17:18:47 +0100 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-12-08 17:18:47 +0100 |
| commit | c35fa3ea1ae8198bd65c2c6e59d9ebd68c115a59 (patch) | |
| tree | 878768b69df25459b448aa890352342c4a3c6e2d /arch/arm/mach-pxa/mioa701_bootresume.S | |
| parent | wusb: add debug files for ASL, PZL and DI to the whci-hcd driver (diff) | |
| parent | Fix a race condition in FASYNC handling (diff) | |
| download | linux-c35fa3ea1ae8198bd65c2c6e59d9ebd68c115a59.tar.xz linux-c35fa3ea1ae8198bd65c2c6e59d9ebd68c115a59.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'arch/arm/mach-pxa/mioa701_bootresume.S')
| -rw-r--r-- | arch/arm/mach-pxa/mioa701_bootresume.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/mioa701_bootresume.S b/arch/arm/mach-pxa/mioa701_bootresume.S index a647693d9856..324d25a48c85 100644 --- 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) |