projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into...
[linux-2.6-block.git]
/
arch
/
arm
/
mach-shmobile
/
sleep-sh7372.S
diff --git
a/arch/arm/mach-shmobile/sleep-sh7372.S
b/arch/arm/mach-shmobile/sleep-sh7372.S
index 53f4840e494914526b4ab23fa09b7a19473c4476..9782862899e81f1895ae0f1312cdfa5623d58914 100644
(file)
--- a/
arch/arm/mach-shmobile/sleep-sh7372.S
+++ b/
arch/arm/mach-shmobile/sleep-sh7372.S
@@
-41,6
+41,7
@@
sh7372_resume_core_standby_sysc:
ldr pc, 1f
+ .align 2
.globl sh7372_cpu_resume
sh7372_cpu_resume:
1: .space 4
@@
-96,6
+97,7
@@
sh7372_do_idle_sysc:
1:
b 1b
+ .align 2
kernel_flush:
.word v7_flush_dcache_all
#endif