From: Al Viro <viro@zeniv.linux.org.uk>
Date: Fri, 21 Oct 2005 07:21:13 +0000 (-0400)
Subject: [PATCH] gfp_t: dma-mapping (cris)
X-Git-Tag: v2.6.15-rc1~733^2~24
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=43b7eae1f5c5424a49ea4a65e9b0e9d5d2fd9446;p=~andy%2Flinux

[PATCH] gfp_t: dma-mapping (cris)

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/include/asm-cris/dma-mapping.h b/include/asm-cris/dma-mapping.h
index 0b5c3fdaefe..8eff51349ae 100644
--- a/include/asm-cris/dma-mapping.h
+++ b/include/asm-cris/dma-mapping.h
@@ -15,14 +15,14 @@
 
 #ifdef CONFIG_PCI
 void *dma_alloc_coherent(struct device *dev, size_t size,
-			   dma_addr_t *dma_handle, int flag);
+			   dma_addr_t *dma_handle, gfp_t flag);
 
 void dma_free_coherent(struct device *dev, size_t size,
 			 void *vaddr, dma_addr_t dma_handle);
 #else
 static inline void *
 dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
-                   int flag)
+                   gfp_t flag)
 {
         BUG();
         return NULL;