---

yaml --- r: 209295 b: refs/heads/master c: e259f19 h: refs/heads/master i: 209293: d1fe0ba 209291: b2cf382 209287: 2337640 209279: 7029db1 v: v3
git-mirror · Aug 13, 2010 · 0eedd55 · 0eedd55
1 parent 600ab0d
commit 0eedd55
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7dcf87a6881bf796faee83003163eb3de41a309
+refs/heads/master: e259f191f2244df04a7746fac1df8aa68ebd0106
diff --git a/trunk/include/linux/dma-mapping.h b/trunk/include/linux/dma-mapping.h
@@ -142,13 +142,15 @@ static inline int dma_set_seg_boundary(struct device *dev, unsigned long mask)
 		return -EIO;
 }
 
+#ifdef CONFIG_HAS_DMA
 static inline int dma_get_cache_alignment(void)
 {
 #ifdef ARCH_DMA_MINALIGN
 	return ARCH_DMA_MINALIGN;
 #endif
 	return 1;
 }
+#endif
 
 /* flags for the coherent memory api */
 #define	DMA_MEMORY_MAP			0x01