summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Szyprowski2016-06-07 13:32:16 +0200
committerMauro Carvalho Chehab2016-06-07 15:25:15 +0200
commit675f9bc7107c01f9459b2feb0d6064b399c16ca2 (patch)
tree276a4a0d6bda306393c782a23af32ff295f84378
parentMerge branch 'for-v4.8/media/exynos-mfc' of git://linuxtv.org/snawrocki/samsu... (diff)
downloadkernel-qcow2-linux-675f9bc7107c01f9459b2feb0d6064b399c16ca2.tar.gz
kernel-qcow2-linux-675f9bc7107c01f9459b2feb0d6064b399c16ca2.tar.xz
kernel-qcow2-linux-675f9bc7107c01f9459b2feb0d6064b399c16ca2.zip
[media] media: s5p-mfc: fix compilation issue on archs other than ARM (32bit)
This patch fixes build break caused by lack of dma-iommu API on ARM64 (this API is specific to ARM 32bit architecture). Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
-rw-r--r--drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h b/drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h
index 5d1d1c2922e8..6962132ae8fa 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h
@@ -14,7 +14,7 @@
#define S5P_MFC_IOMMU_DMA_BASE 0x20000000lu
#define S5P_MFC_IOMMU_DMA_SIZE SZ_256M
-#ifdef CONFIG_EXYNOS_IOMMU
+#if defined(CONFIG_EXYNOS_IOMMU) && defined(CONFIG_ARM_DMA_USE_IOMMU)
#include <asm/dma-iommu.h>