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 | |
| parent | e0f998930eb67c49f2862c58a45262ad0bc03eca (diff) | |
| parent | 260b23674fdb570f3235ce55892246bef1c24c2a (diff) | |
Auto-update from upstream
Diffstat (limited to 'drivers/parisc')
| -rw-r--r-- | drivers/parisc/ccio-dma.c | 2 | ||||
| -rw-r--r-- | drivers/parisc/sba_iommu.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c index f1c442ab9102..9e0229f7e25f 100644 --- a/drivers/parisc/ccio-dma.c +++ b/drivers/parisc/ccio-dma.c | |||
| @@ -836,7 +836,7 @@ ccio_unmap_single(struct device *dev, dma_addr_t iova, size_t size, | |||
| 836 | * This function implements the pci_alloc_consistent function. | 836 | * This function implements the pci_alloc_consistent function. |
| 837 | */ | 837 | */ |
| 838 | static void * | 838 | static void * |
| 839 | ccio_alloc_consistent(struct device *dev, size_t size, dma_addr_t *dma_handle, int flag) | 839 | ccio_alloc_consistent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag) |
| 840 | { | 840 | { |
| 841 | void *ret; | 841 | void *ret; |
| 842 | #if 0 | 842 | #if 0 |
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 | ||