Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 358816
b: refs/heads/master
c: d09e133
h: refs/heads/master
v: v3
  • Loading branch information
Hiroshi Doyu authored and Marek Szyprowski committed Feb 25, 2013
1 parent afff27b commit 7776abb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3e3a1823281fc342ac5d99d853167e009bb86258
refs/heads/master: d09e1333ec6c8c6fe2875dc2763ebbac84efe8d7
4 changes: 4 additions & 0 deletions trunk/arch/arm/mm/dma-mapping.c
Original file line number Diff line number Diff line change
Expand Up @@ -1732,6 +1732,8 @@ struct dma_map_ops iommu_ops = {
.unmap_sg = arm_iommu_unmap_sg,
.sync_sg_for_cpu = arm_iommu_sync_sg_for_cpu,
.sync_sg_for_device = arm_iommu_sync_sg_for_device,

.set_dma_mask = arm_dma_set_mask,
};

struct dma_map_ops iommu_coherent_ops = {
Expand All @@ -1745,6 +1747,8 @@ struct dma_map_ops iommu_coherent_ops = {

.map_sg = arm_coherent_iommu_map_sg,
.unmap_sg = arm_coherent_iommu_unmap_sg,

.set_dma_mask = arm_dma_set_mask,
};

/**
Expand Down

0 comments on commit 7776abb

Please sign in to comment.