projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: dde4509)
[media] media: s5p-mfc: fix compilation issue on archs other than ARM (32bit)
authorMarek Szyprowski <m.szyprowski@samsung.com>
Tue, 7 Jun 2016 11:32:16 +0000 (08:32 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Tue, 7 Jun 2016 13:25:15 +0000 (10:25 -0300)
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>
drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h patch | blob | history

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h b/drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h
index 5d1d1c2..6962132 100644 (file)
--- 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>
 
Domain: System / Kernel;