---

yaml --- r: 138908 b: refs/heads/master c: 0d688da h: refs/heads/master v: v3
git-mirror · Feb 3, 2009 · bb8da35 · bb8da35
1 parent 9e6a1a0
commit bb8da35
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7ab5c46ae2743079a40bb4060e510418c0842b4
+refs/heads/master: 0d688da5505d77bcef2441e0a22d8cc26459702d
diff --git a/trunk/arch/ia64/include/asm/dma-mapping.h b/trunk/arch/ia64/include/asm/dma-mapping.h
@@ -24,7 +24,7 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size,
 				       dma_addr_t *daddr, gfp_t gfp)
 {
 	struct dma_map_ops *ops = platform_dma_get_ops(dev);
-	return ops->alloc_coherent(dev, size, daddr, gfp | GFP_DMA);
+	return ops->alloc_coherent(dev, size, daddr, gfp);
 }
 
 static inline void dma_free_coherent(struct device *dev, size_t size,