diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-12-08 11:18:47 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-12-08 11:18:47 -0500 |
| commit | c35fa3ea1ae8198bd65c2c6e59d9ebd68c115a59 (patch) | |
| tree | 878768b69df25459b448aa890352342c4a3c6e2d /arch/arm/mach-pxa/mioa701_bootresume.S | |
| parent | dcc7461eef7341e84e2f7274f904ce01a43b2506 (diff) | |
| parent | 218d11a8b071b23b76c484fd5f72a4fe3306801e (diff) | |
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) | |||
| 24 | 1: | 24 | 1: |
| 25 | mov r0, #0xa0000000 @ Don't suppose memory access works | 25 | mov r0, #0xa0000000 @ Don't suppose memory access works |
| 26 | orr r0, r0, #0x00200000 @ even if it's supposed to | 26 | orr r0, r0, #0x00200000 @ even if it's supposed to |
| 27 | orr r0, r0, #0x0000b000 | ||
| 27 | mov r1, #0 | 28 | mov r1, #0 |
| 28 | str r1, [r0] @ Early disable resume for next boot | 29 | str r1, [r0] @ Early disable resume for next boot |
| 29 | ldr r0, mioa701_jumpaddr @ (Murphy's Law) | 30 | ldr r0, mioa701_jumpaddr @ (Murphy's Law) |