diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 00:59:34 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 00:59:34 -0500 |
| commit | 725b2805fd5d729b0db59fe8fc992e97523782c7 (patch) | |
| tree | 04ca7c7ed6e918029898a6c5301488e60d0564d4 /arch/arm/mach-s3c2410/sleep.S | |
| parent | 9ac341ae799413708e674bc65c8a72c90dae8d34 (diff) | |
| parent | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/arm/mach-s3c2410/sleep.S')
| -rw-r--r-- | arch/arm/mach-s3c2410/sleep.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/sleep.S b/arch/arm/mach-s3c2410/sleep.S index e9a055b779b7..832fb86a03b4 100644 --- a/arch/arm/mach-s3c2410/sleep.S +++ b/arch/arm/mach-s3c2410/sleep.S | |||
| @@ -72,7 +72,7 @@ ENTRY(s3c2410_cpu_suspend) | |||
| 72 | @@ prepare cpu to sleep | 72 | @@ prepare cpu to sleep |
| 73 | 73 | ||
| 74 | ldr r4, =S3C2410_REFRESH | 74 | ldr r4, =S3C2410_REFRESH |
| 75 | ldr r5, =S3C2410_MISCCR | 75 | ldr r5, =S3C24XX_MISCCR |
| 76 | ldr r6, =S3C2410_CLKCON | 76 | ldr r6, =S3C2410_CLKCON |
| 77 | ldr r7, [ r4 ] @ get REFRESH (and ensure in TLB) | 77 | ldr r7, [ r4 ] @ get REFRESH (and ensure in TLB) |
| 78 | ldr r8, [ r5 ] @ get MISCCR (and ensure in TLB) | 78 | ldr r8, [ r5 ] @ get MISCCR (and ensure in TLB) |