diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-12 03:01:50 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-12 03:01:50 -0400 |
| commit | 5629d41d5ce255802cd3c350fbadfe5f3aa5f279 (patch) | |
| tree | e00fcb33fd2e25305b3243e060e01cd346d4af94 /include | |
| parent | 3eac8c69d1ac1266327f4e29deb23716a12c6d30 (diff) | |
powerpc: Bring in some changes made to arch/ppc and include/asm-ppc64
Recent commits upstream have changed files which are currently
duplicated in arch/powerpc and include/asm-powerpc. This updates
them with the corresponding changes.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-powerpc/iommu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-powerpc/iommu.h b/include/asm-powerpc/iommu.h index d096faf4191e..f80ec8daf122 100644 --- a/include/asm-powerpc/iommu.h +++ b/include/asm-powerpc/iommu.h | |||
| @@ -88,7 +88,7 @@ extern void iommu_unmap_sg(struct iommu_table *tbl, struct scatterlist *sglist, | |||
| 88 | int nelems, enum dma_data_direction direction); | 88 | int nelems, enum dma_data_direction direction); |
| 89 | 89 | ||
| 90 | extern void *iommu_alloc_coherent(struct iommu_table *tbl, size_t size, | 90 | extern void *iommu_alloc_coherent(struct iommu_table *tbl, size_t size, |
| 91 | dma_addr_t *dma_handle, unsigned int __nocast flag); | 91 | dma_addr_t *dma_handle, gfp_t flag); |
| 92 | extern void iommu_free_coherent(struct iommu_table *tbl, size_t size, | 92 | extern void iommu_free_coherent(struct iommu_table *tbl, size_t size, |
| 93 | void *vaddr, dma_addr_t dma_handle); | 93 | void *vaddr, dma_addr_t dma_handle); |
| 94 | extern dma_addr_t iommu_map_single(struct iommu_table *tbl, void *vaddr, | 94 | extern dma_addr_t iommu_map_single(struct iommu_table *tbl, void *vaddr, |