diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-02 01:12:54 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-02 01:12:54 -0500 |
| commit | 18ee3610040a4c008ce08a40a5dd025241cc7e97 (patch) | |
| tree | 32a996a5123726b63c31a1522f230933fb967a32 /arch/arm/mach-s3c2410/sleep.S | |
| parent | e4e7b89280d1d666e2c09e5ad36cf071796c4c7e (diff) | |
| parent | b4103333d7904310d34de18d85e51e3d74f00a3b (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/arm/mach-s3c2410/sleep.S')
| -rw-r--r-- | arch/arm/mach-s3c2410/sleep.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2410/sleep.S b/arch/arm/mach-s3c2410/sleep.S index 61768dac7fee..e9a055b779b7 100644 --- a/arch/arm/mach-s3c2410/sleep.S +++ b/arch/arm/mach-s3c2410/sleep.S | |||
| @@ -133,12 +133,12 @@ ENTRY(s3c2410_cpu_resume) | |||
| 133 | @@ load UART to allow us to print the two characters for | 133 | @@ load UART to allow us to print the two characters for |
| 134 | @@ resume debug | 134 | @@ resume debug |
| 135 | 135 | ||
| 136 | mov r2, #S3C2410_PA_UART & 0xff000000 | 136 | mov r2, #S3C24XX_PA_UART & 0xff000000 |
| 137 | orr r2, r2, #S3C2410_PA_UART & 0xff000 | 137 | orr r2, r2, #S3C24XX_PA_UART & 0xff000 |
| 138 | 138 | ||
| 139 | #if 0 | 139 | #if 0 |
| 140 | /* SMDK2440 LED set */ | 140 | /* SMDK2440 LED set */ |
| 141 | mov r14, #S3C2410_PA_GPIO | 141 | mov r14, #S3C24XX_PA_GPIO |
| 142 | ldr r12, [ r14, #0x54 ] | 142 | ldr r12, [ r14, #0x54 ] |
| 143 | bic r12, r12, #3<<4 | 143 | bic r12, r12, #3<<4 |
| 144 | orr r12, r12, #1<<7 | 144 | orr r12, r12, #1<<7 |