git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-s3c2410
/
sleep.S
diff --git
a/arch/arm/mach-s3c2410/sleep.S
b/arch/arm/mach-s3c2410/sleep.S
index e9a055b779b7f1158c1759ebd7cecab08e4a2ab7..832fb86a03b430343dd26e9e5be83168ab644c17 100644
(file)
--- a/
arch/arm/mach-s3c2410/sleep.S
+++ b/
arch/arm/mach-s3c2410/sleep.S
@@
-72,7
+72,7
@@
ENTRY(s3c2410_cpu_suspend)
@@ prepare cpu to sleep
ldr r4, =S3C2410_REFRESH
- ldr r5, =S3C24
10
_MISCCR
+ ldr r5, =S3C24
XX
_MISCCR
ldr r6, =S3C2410_CLKCON
ldr r7, [ r4 ] @ get REFRESH (and ensure in TLB)
ldr r8, [ r5 ] @ get MISCCR (and ensure in TLB)