summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-10-27 10:41:58 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-10-27 10:41:58 +0900
commit478fb158005b55c8484f23a6beb1b69f5a612162 (patch)
treeca9ca7630ebecc13f435288b7076728e2de008f6 /arch
parent7693465d81827107caf9c447b9ad91098a1c4941 (diff)
downloadblackbird-op-linux-478fb158005b55c8484f23a6beb1b69f5a612162.tar.gz
blackbird-op-linux-478fb158005b55c8484f23a6beb1b69f5a612162.zip
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/sh/include/asm/dma-mapping.h5
1 files changed, 5 insertions, 0 deletions
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)
{
OpenPOWER on IntegriCloud