Merge branch 'depends/rmk/memory_h' into next/fixes

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-davinci / sleep.S

diff --git a/arch/arm/mach-davinci/sleep.S b/arch/arm/mach-davinci/sleep.S
index 574028995545e90cce8b564f1794c8fa2f5935ae..d4e9316ecacbdca92c627b9e706b10f5a520b24a 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:
-       .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