diff options
| author | Shiraz Hashim <shashim@codeaurora.org> | 2015-11-18 12:46:05 +0530 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-22 11:14:34 -0700 |
| commit | d880efb0215477d2d2772a11e1d6a6c9dbade606 (patch) | |
| tree | 9005d049b78c9d1158ae30a2e28402b3acd7c902 /include/linux | |
| parent | 3a25b40a4e0aff69443e446e4293c7b63828c331 (diff) | |
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 <shashim@codeaurora.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/msm_dma_iommu_mapping.h | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |