diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-11 01:48:37 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-11 01:48:37 -0400 |
| commit | 1a04392bd6439876b1552793389cbb5be356ea54 (patch) | |
| tree | 12af7b77e3b0848127f2d2871778c9c1f315578a /include/asm-ppc/dma-mapping.h | |
| parent | 68399bb5080c1d96f2110b0a040b39d3ccd7a18a (diff) | |
| parent | 3c92c2ba33cd7d666c5f83cc32aa590e794e91b0 (diff) | |
| download | linux-1a04392bd6439876b1552793389cbb5be356ea54.tar.gz linux-1a04392bd6439876b1552793389cbb5be356ea54.tar.bz2 linux-1a04392bd6439876b1552793389cbb5be356ea54.zip | |
Merge branch 'master'
Diffstat (limited to 'include/asm-ppc/dma-mapping.h')
| -rw-r--r-- | include/asm-ppc/dma-mapping.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ppc/dma-mapping.h b/include/asm-ppc/dma-mapping.h index 92b8ee78dcc2..061bfcac1bf1 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); |