From f0484693a9725ee3e3a565edebdf17d33f6a5f25 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 27 Oct 2009 10:41:58 +0900
Subject: [PATCH] --- yaml --- r: 173441 b: refs/heads/master c:
 478fb158005b55c8484f23a6beb1b69f5a612162 h: refs/heads/master i:   173439:
 2f7c7f35d2edc48be6e182676ead1aa8fa07e84b v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/sh/include/asm/dma-mapping.h | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 154558c6e005..b3c102aca27f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7693465d81827107caf9c447b9ad91098a1c4941
+refs/heads/master: 478fb158005b55c8484f23a6beb1b69f5a612162
diff --git a/trunk/arch/sh/include/asm/dma-mapping.h b/trunk/arch/sh/include/asm/dma-mapping.h
index 653076018df0..87ced133a363 100644
--- a/trunk/arch/sh/include/asm/dma-mapping.h
+++ b/trunk/arch/sh/include/asm/dma-mapping.h
@@ -41,7 +41,12 @@ void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
 
 #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
 #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
+
+#ifdef CONFIG_DMA_COHERENT
 #define dma_is_consistent(d, h) (1)
+#else
+#define dma_is_consistent(d, h) (0)
+#endif
 
 static inline int dma_get_cache_alignment(void)
 {