aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-um
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2005-10-21 03:21:53 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-28 08:16:49 -0700
commit970a9e73f9036ef89d46b8240f99463f6d244c1d (patch)
tree0a55b5f311024661468a96fb01cb1063816f8d95 /include/asm-um
parent[PATCH] gfp_t: dma-mapping (xtensa) (diff)
downloadlinux-dev-970a9e73f9036ef89d46b8240f99463f6d244c1d.tar.xz
linux-dev-970a9e73f9036ef89d46b8240f99463f6d244c1d.zip
[PATCH] gfp_t: dma-mapping (simple cases)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-um')
-rw-r--r--include/asm-um/dma-mapping.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-um/dma-mapping.h b/include/asm-um/dma-mapping.h
index 13e6291f7151..babd29895114 100644
--- a/include/asm-um/dma-mapping.h
+++ b/include/asm-um/dma-mapping.h
@@ -19,7 +19,7 @@ dma_set_mask(struct device *dev, u64 dma_mask)
static inline void *
dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
- int flag)
+ gfp_t flag)
{
BUG();
return((void *) 0);