From 7776abb308b8f180d5d64709ca30ae0e60b3e843 Mon Sep 17 00:00:00 2001 From: Hiroshi Doyu Date: Tue, 29 Jan 2013 14:57:07 +0200 Subject: [PATCH] --- yaml --- r: 358816 b: refs/heads/master c: d09e1333ec6c8c6fe2875dc2763ebbac84efe8d7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mm/dma-mapping.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 018d4eceb8ea..1ed5219b0ec2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e3a1823281fc342ac5d99d853167e009bb86258 +refs/heads/master: d09e1333ec6c8c6fe2875dc2763ebbac84efe8d7 diff --git a/trunk/arch/arm/mm/dma-mapping.c b/trunk/arch/arm/mm/dma-mapping.c index dda3904dc64c..d91c4880f559 100644 --- a/trunk/arch/arm/mm/dma-mapping.c +++ b/trunk/arch/arm/mm/dma-mapping.c @@ -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 = { @@ -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, }; /**