summaryrefslogtreecommitdiffstats
path: root/include/asm-sh/machvec.h
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2005-10-21 09:21:38 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-28 17:16:48 +0200
commit6dae2c2306684d9e76a04c22dc090380a9009f12 (patch)
treef15fae33cf83d5e3eb57a3399cd61da59adb1ba5 /include/asm-sh/machvec.h
parent[PATCH] gfp_t: dma-mapping (ppc) (diff)
downloadlinux-6dae2c2306684d9e76a04c22dc090380a9009f12.tar.xz
linux-6dae2c2306684d9e76a04c22dc090380a9009f12.zip
[PATCH] gfp_t: dma-mapping (sh)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-sh/machvec.h')
-rw-r--r--include/asm-sh/machvec.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sh/machvec.h b/include/asm-sh/machvec.h
index 5771f4baa478..3f18aa180516 100644
--- a/include/asm-sh/machvec.h
+++ b/include/asm-sh/machvec.h
@@ -64,7 +64,7 @@ struct sh_machine_vector
void (*mv_heartbeat)(void);
- void *(*mv_consistent_alloc)(struct device *, size_t, dma_addr_t *, int);
+ void *(*mv_consistent_alloc)(struct device *, size_t, dma_addr_t *, gfp_t);
int (*mv_consistent_free)(struct device *, size_t, void *, dma_addr_t);
};