summaryrefslogtreecommitdiff
path: root/include/asm-sh64/dma-mapping.h
diff options
context:
space:
mode:
authorKyle McMartin <kyle@parisc-linux.org>2005-10-28 20:18:07 +0400
committerKyle McMartin <kyle@parisc-linux.org>2005-10-28 20:18:07 +0400
commit210cc679faf0e1cabda9fc5d1279644f5e52aecb (patch)
treef0816c90ae937a159f8bfec6018a6271223b954a /include/asm-sh64/dma-mapping.h
parente0f998930eb67c49f2862c58a45262ad0bc03eca (diff)
parent260b23674fdb570f3235ce55892246bef1c24c2a (diff)
downloadlinux-210cc679faf0e1cabda9fc5d1279644f5e52aecb.tar.xz
Auto-update from upstream
Diffstat (limited to 'include/asm-sh64/dma-mapping.h')
-rw-r--r--include/asm-sh64/dma-mapping.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sh64/dma-mapping.h b/include/asm-sh64/dma-mapping.h
index b8d26fe677f4..cc9a2e86f5b4 100644
--- a/include/asm-sh64/dma-mapping.h
+++ b/include/asm-sh64/dma-mapping.h
@@ -25,7 +25,7 @@ static inline int dma_set_mask(struct device *dev, u64 mask)
}
static inline 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)
{
return consistent_alloc(NULL, size, dma_handle);
}