aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-sparc/dma-mapping.h
diff options
context:
space:
mode:
authorKyle McMartin <kyle@parisc-linux.org>2005-10-28 12:18:07 -0400
committerKyle McMartin <kyle@parisc-linux.org>2005-10-28 12:18:07 -0400
commit210cc679faf0e1cabda9fc5d1279644f5e52aecb (patch)
treef0816c90ae937a159f8bfec6018a6271223b954a /include/asm-sparc/dma-mapping.h
parente0f998930eb67c49f2862c58a45262ad0bc03eca (diff)
parent260b23674fdb570f3235ce55892246bef1c24c2a (diff)
downloadkernel_samsung_smdk4412-210cc679faf0e1cabda9fc5d1279644f5e52aecb.zip
kernel_samsung_smdk4412-210cc679faf0e1cabda9fc5d1279644f5e52aecb.tar.gz
kernel_samsung_smdk4412-210cc679faf0e1cabda9fc5d1279644f5e52aecb.tar.bz2
Auto-update from upstream
Diffstat (limited to 'include/asm-sparc/dma-mapping.h')
-rw-r--r--include/asm-sparc/dma-mapping.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc/dma-mapping.h b/include/asm-sparc/dma-mapping.h
index 2dc5bb8..d7c3b0f 100644
--- a/include/asm-sparc/dma-mapping.h
+++ b/include/asm-sparc/dma-mapping.h
@@ -8,7 +8,7 @@
#else
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)
{
BUG();
return NULL;