summaryrefslogtreecommitdiffstats
path: root/include/asm-ppc/dma-mapping.h
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2005-10-11 09:29:48 +0100
committerAnton Altaparmakov <aia21@cantab.net>2005-10-11 09:29:48 +0100
commit29d8699ebb1e8948a612306c69e6d9c4ef23342f (patch)
treef2378e8d2fbef7fc215a25acf2042b8965109e5e /include/asm-ppc/dma-mapping.h
parente9438250b635f7832e99a8c8d2e394dd1522ce65 (diff)
parent907a42617970a159361f17ef9a63f04d276995ab (diff)
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'include/asm-ppc/dma-mapping.h')
-rw-r--r--include/asm-ppc/dma-mapping.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ppc/dma-mapping.h b/include/asm-ppc/dma-mapping.h
index 92b8ee78dcc..061bfcac1bf 100644
--- a/include/asm-ppc/dma-mapping.h
+++ b/include/asm-ppc/dma-mapping.h
@@ -61,7 +61,7 @@ static inline int 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,
- unsigned int __nocast gfp)
+ gfp_t gfp)
{
#ifdef CONFIG_NOT_COHERENT_CACHE
return __dma_alloc_coherent(size, dma_handle, gfp);