From 827f2fe9f19516d017c527a7b89d0ffcabcffed7 Mon Sep 17 00:00:00 2001
From: Linus Walleij <linus.walleij@linaro.org>
Date: Tue, 2 Aug 2011 17:48:38 +0200
Subject: [PATCH] --- yaml --- r: 263754 b: refs/heads/master c:
 897a6a1a14837d6d582bfd1fd7aba00be44b6469 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/arch/arm/mach-davinci/sleep.S | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 912d90e56bd4..d2cb2cfc634b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c08748005d56084a205f5c5db5f211b07a97a9be
+refs/heads/master: 897a6a1a14837d6d582bfd1fd7aba00be44b6469
diff --git a/trunk/arch/arm/mach-davinci/sleep.S b/trunk/arch/arm/mach-davinci/sleep.S
index fb5e72b532b0..5f1e045a3ad1 100644
--- a/trunk/arch/arm/mach-davinci/sleep.S
+++ b/trunk/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