diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 16:17:52 (GMT) |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 16:17:52 (GMT) |
| commit | 90890687859ea658759e653c4e70ed7e9e1a6217 (patch) | |
| tree | 9065b30bb189e16ef99b8b5a0d444558f8dc579f /arch/mips/mm/dma-ip32.c | |
| parent | 2995bfb7855aabd493f840af361f3dd7d221caea (diff) | |
| parent | 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff) | |
| download | linux-fsl-qoriq-90890687859ea658759e653c4e70ed7e9e1a6217.tar.xz | |
Merge branch 'master'
Diffstat (limited to 'arch/mips/mm/dma-ip32.c')
| -rw-r--r-- | arch/mips/mm/dma-ip32.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/mm/dma-ip32.c b/arch/mips/mm/dma-ip32.c index 2cbe196..a7e3072 100644 --- a/arch/mips/mm/dma-ip32.c +++ b/arch/mips/mm/dma-ip32.c @@ -37,7 +37,7 @@ #define RAM_OFFSET_MASK 0x3fffffff void *dma_alloc_noncoherent(struct device *dev, size_t size, - dma_addr_t * dma_handle, int gfp) + dma_addr_t * dma_handle, gfp_t gfp) { void *ret; /* ignore region specifiers */ @@ -61,7 +61,7 @@ void *dma_alloc_noncoherent(struct device *dev, size_t size, EXPORT_SYMBOL(dma_alloc_noncoherent); void *dma_alloc_coherent(struct device *dev, size_t size, - dma_addr_t * dma_handle, int gfp) + dma_addr_t * dma_handle, gfp_t gfp) { void *ret; |