summaryrefslogtreecommitdiffstats
path: root/include/asm-m68k
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2006-10-06 00:43:58 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-06 08:53:41 -0700
commitdc366708b3b022050f139347a44c65a102e4835d (patch)
tree35cf754c3a86a65fc95a5f5c440854abc5bf4ca4 /include/asm-m68k
parent5e7c4ea83efa9d6269bcbf17611f83aeef71c096 (diff)
downloadblackbird-op-linux-dc366708b3b022050f139347a44c65a102e4835d.tar.gz
blackbird-op-linux-dc366708b3b022050f139347a44c65a102e4835d.zip
[PATCH] m68k: dma_alloc_coherent() has gfp_t as the last argument
annotate, fix the bogus argument of vmap() in it. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Cc: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-m68k')
-rw-r--r--include/asm-m68k/dma-mapping.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-m68k/dma-mapping.h b/include/asm-m68k/dma-mapping.h
index cebbb03370ec..c1299c3beb50 100644
--- a/include/asm-m68k/dma-mapping.h
+++ b/include/asm-m68k/dma-mapping.h
@@ -26,7 +26,7 @@ static inline int dma_is_consistent(dma_addr_t dma_addr)
}
extern void *dma_alloc_coherent(struct device *, size_t,
- dma_addr_t *, int);
+ dma_addr_t *, gfp_t);
extern void dma_free_coherent(struct device *, size_t,
void *, dma_addr_t);
OpenPOWER on IntegriCloud