diff options
Diffstat (limited to 'include/asm-cris/dma-mapping.h')
| -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 @@ | |||
| 15 | 15 | ||
| 16 | #ifdef CONFIG_PCI | 16 | #ifdef CONFIG_PCI |
| 17 | void *dma_alloc_coherent(struct device *dev, size_t size, | 17 | void *dma_alloc_coherent(struct device *dev, size_t size, |
| 18 | dma_addr_t *dma_handle, int flag); | 18 | dma_addr_t *dma_handle, gfp_t flag); |
| 19 | 19 | ||
| 20 | void dma_free_coherent(struct device *dev, size_t size, | 20 | void dma_free_coherent(struct device *dev, size_t size, |
| 21 | void *vaddr, dma_addr_t dma_handle); | 21 | void *vaddr, dma_addr_t dma_handle); |
| 22 | #else | 22 | #else |
| 23 | static inline void * | 23 | static inline void * |
| 24 | dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, | 24 | dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, |
| 25 | int flag) | 25 | gfp_t flag) |
| 26 | { | 26 | { |
| 27 | BUG(); | 27 | BUG(); |
| 28 | return NULL; | 28 | return NULL; |
