summaryrefslogtreecommitdiff
path: root/include/asm-m68k/dma-mapping.h
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-03-14 12:20:40 +0300
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-15 01:27:51 +0300
commit69300436ca382a4753044142ae3a2c8099e70215 (patch)
treef058aec98fd0870a7a0e585ab3025a7610081134 /include/asm-m68k/dma-mapping.h
parent27d871833e37ce4ef9a4d8a153598da1b429a490 (diff)
downloadlinux-69300436ca382a4753044142ae3a2c8099e70215.tar.xz
[PATCH] m68k dma-mapping: gfp_t annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-m68k/dma-mapping.h')
-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 00259ed6fc95..a26cdeb46a57 100644
--- a/include/asm-m68k/dma-mapping.h
+++ b/include/asm-m68k/dma-mapping.h
@@ -32,7 +32,7 @@ extern void dma_free_coherent(struct device *, size_t,
void *, dma_addr_t);
static inline void *dma_alloc_noncoherent(struct device *dev, size_t size,
- dma_addr_t *handle, int flag)
+ dma_addr_t *handle, gfp_t flag)
{
return dma_alloc_coherent(dev, size, handle, flag);
}