From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 27 Oct 2009 01:41:58 +0000 (+0900)
Subject: sh: Fix up dma_is_consistent().
X-Git-Tag: v2.6.33-rc1~347^2~27^2~52
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=478fb158005b55c8484f23a6beb1b69f5a612162;p=karo-tx-linux.git

sh: Fix up dma_is_consistent().

This fixes up the dma_is_consistent() definition for the various
coherence options.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

diff --git a/arch/sh/include/asm/dma-mapping.h b/arch/sh/include/asm/dma-mapping.h
index 653076018df0..87ced133a363 100644
--- a/arch/sh/include/asm/dma-mapping.h
+++ b/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)
 {