git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream/ticketlock-cleanup' of git://github.com/jsgf/linux-xen into...
[pandora-kernel.git]
/
arch
/
arm
/
mach-davinci
/
sleep.S
diff --git
a/arch/arm/mach-davinci/sleep.S
b/arch/arm/mach-davinci/sleep.S
index
fb5e72b
..
5f1e045
100644
(file)
--- a/
arch/arm/mach-davinci/sleep.S
+++ b/
arch/arm/mach-davinci/sleep.S
@@
-217,7
+217,11
@@
ddr2clk_stop_done:
ENDPROC(davinci_ddr_psc_config)
CACHE_FLUSH:
ENDPROC(davinci_ddr_psc_config)
CACHE_FLUSH:
- .word arm926_flush_kern_cache_all
+#ifdef CONFIG_CPU_V6
+ .word v6_flush_kern_cache_all
+#else
+ .word arm926_flush_kern_cache_all
+#endif
ENTRY(davinci_cpu_suspend_sz)
.word . - davinci_cpu_suspend
ENTRY(davinci_cpu_suspend_sz)
.word . - davinci_cpu_suspend