From d880efb0215477d2d2772a11e1d6a6c9dbade606 Mon Sep 17 00:00:00 2001 From: Shiraz Hashim Date: Wed, 18 Nov 2015 12:46:05 +0530 Subject: dma-mapping: fix build when !CONFIG_ARM_DMA_USE_IOMMU Allow compilation when CONFIG_ARM_DMA_USE_IOMMU is not selected by providing necessary stub functions and fix few mismatch in function declarations. Following this, remove the changes introduced by f3d8d1061fb0b146b3f5 ("msm: ipa: add empty implementation for iommu functions") as they are no longer needed. Change-Id: I04e3aa63407064e8d9c9550a5cb0a82ede899f00 Signed-off-by: Shiraz Hashim --- include/linux/msm_dma_iommu_mapping.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/linux/msm_dma_iommu_mapping.h b/include/linux/msm_dma_iommu_mapping.h index b222e55810de..370d6f5e1d65 100644 --- a/include/linux/msm_dma_iommu_mapping.h +++ b/include/linux/msm_dma_iommu_mapping.h @@ -62,7 +62,7 @@ void msm_dma_buf_freed(void *buffer); static inline int msm_dma_map_sg_attrs(struct device *dev, struct scatterlist *sg, int nents, enum dma_data_direction dir, struct dma_buf *dma_buf, - int flags) + struct dma_attrs *attr) { return -EINVAL; } -- cgit v1.2.3