diff options
| author | Al Viro | 2005-10-21 09:21:13 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2005-10-28 17:16:48 +0200 |
| commit | 43b7eae1f5c5424a49ea4a65e9b0e9d5d2fd9446 (patch) | |
| tree | 99ea40aa04b3d77e90df415d54c40f2a812b88a8 /include/asm-cris | |
| parent | [PATCH] gfp_t: dma-mapping (alpha) (diff) | |
| download | kernel-qcow2-linux-43b7eae1f5c5424a49ea4a65e9b0e9d5d2fd9446.tar.gz kernel-qcow2-linux-43b7eae1f5c5424a49ea4a65e9b0e9d5d2fd9446.tar.xz kernel-qcow2-linux-43b7eae1f5c5424a49ea4a65e9b0e9d5d2fd9446.zip | |
[PATCH] gfp_t: dma-mapping (cris)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-cris')
| -rw-r--r-- | include/asm-cris/dma-mapping.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-cris/dma-mapping.h b/include/asm-cris/dma-mapping.h index 0b5c3fdaefe1..8eff51349ae7 100644 --- a/include/asm-cris/dma-mapping.h +++ b/include/asm-cris/dma-mapping.h @@ -15,14 +15,14 @@ #ifdef CONFIG_PCI void *dma_alloc_coherent(struct device *dev, size_t size, - dma_addr_t *dma_handle, int flag); + dma_addr_t *dma_handle, gfp_t flag); void dma_free_coherent(struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle); #else static inline void * dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, - int flag) + gfp_t flag) { BUG(); return NULL; |