diff options
author | Kyle McMartin <kyle@parisc-linux.org> | 2005-10-28 12:18:07 -0400 |
---|---|---|
committer | Kyle McMartin <kyle@parisc-linux.org> | 2005-10-28 12:18:07 -0400 |
commit | 210cc679faf0e1cabda9fc5d1279644f5e52aecb (patch) | |
tree | f0816c90ae937a159f8bfec6018a6271223b954a /drivers/parisc/sba_iommu.c | |
parent | e0f998930eb67c49f2862c58a45262ad0bc03eca (diff) | |
parent | 260b23674fdb570f3235ce55892246bef1c24c2a (diff) |
Auto-update from upstream
Diffstat (limited to 'drivers/parisc/sba_iommu.c')
-rw-r--r-- | drivers/parisc/sba_iommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c index 48591badd4ce..c85653f315aa 100644 --- a/drivers/parisc/sba_iommu.c +++ b/drivers/parisc/sba_iommu.c | |||
@@ -1024,7 +1024,7 @@ sba_unmap_single(struct device *dev, dma_addr_t iova, size_t size, | |||
1024 | * See Documentation/DMA-mapping.txt | 1024 | * See Documentation/DMA-mapping.txt |
1025 | */ | 1025 | */ |
1026 | static void *sba_alloc_consistent(struct device *hwdev, size_t size, | 1026 | static void *sba_alloc_consistent(struct device *hwdev, size_t size, |
1027 | dma_addr_t *dma_handle, int gfp) | 1027 | dma_addr_t *dma_handle, gfp_t gfp) |
1028 | { | 1028 | { |
1029 | void *ret; | 1029 | void *ret; |
1030 | 1030 | ||