diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-06 09:43:58 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 17:53:41 +0200 |
| commit | dc366708b3b022050f139347a44c65a102e4835d (patch) | |
| tree | 35cf754c3a86a65fc95a5f5c440854abc5bf4ca4 /include/asm-m68k | |
| parent | [PATCH] m68k: fix NBPG define (diff) | |
| download | linux-dc366708b3b022050f139347a44c65a102e4835d.tar.xz 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.h | 2 |
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); |