commit 5c1fb41f40b7b6d819a617f52dbd66b6938ef362
author Al Viro <viro@zeniv.linux.org.uk> Fri Oct 21 03:21:28 2005 -0400
committer Linus Torvalds <torvalds@g5.osdl.org> Fri Oct 28 08:16:48 2005 -0700
tree fcd42c30e7d7f4663702afdc94d252610a537300
parent 185a8ff52875d8db31b9346ab186f75baa616dee

[PATCH] gfp_t: dma-mapping (parisc)

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

drivers/parisc/ccio-dma.c

diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
index 0e98a9d..a3bd91a 100644
--- a/drivers/parisc/ccio-dma.c
+++ b/drivers/parisc/ccio-dma.c
@@ -836,7 +836,7 @@
  * This function implements the pci_alloc_consistent function.
  */
 static void * 
-ccio_alloc_consistent(struct device *dev, size_t size, dma_addr_t *dma_handle, int flag)
+ccio_alloc_consistent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag)
 {
       void *ret;
 #if 0