---

yaml --- r: 173441 b: refs/heads/master c: 478fb15 h: refs/heads/master i: 173439: 2f7c7f3 v: v3
git-mirror · Oct 27, 2009 · f048469 · f048469
1 parent 503d6f3
commit f048469
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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)
 {