From: Marek Szyprowski <m.szyprowski@samsung•com>
To: linux-media@vger•kernel.org, linux-samsung-soc@vger•kernel.org,
linux-next@vger•kernel.org, linux-arm-kernel@lists•infradead.org
Cc: Marek Szyprowski <m.szyprowski@samsung•com>,
Sylwester Nawrocki <s.nawrocki@samsung•com>,
Kamil Debski <k.debski@samsung•com>,
Kukjin Kim <kgene@kernel•org>,
Krzysztof Kozlowski <k.kozlowski@samsung•com>,
Javier Martinez Canillas <javier@osg•samsung.com>,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung•com>,
Mark Brown <broonie@kernel•org>,
linaro-kernel@lists•linaro.org
Subject: [PATCH] media: s5p-mfc: fix compilation issue on archs other than ARM (32bit)
Date: Tue, 07 Jun 2016 13:32:16 +0200 [thread overview]
Message-ID: <1465299136-8596-1-git-send-email-m.szyprowski@samsung.com> (raw)
In-Reply-To: <20160607105823.GT7510@sirena.org.uk>
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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
--- 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>
--
1.9.2
next prev parent reply other threads:[~2016-06-07 11:32 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-07 7:35 next-20160607 build: 2 failures 9 warnings (next-20160607) Build bot for Mark Brown
2016-06-07 10:58 ` Mark Brown
2016-06-07 11:32 ` Marek Szyprowski [this message]
2016-06-07 13:22 ` Sylwester Nawrocki
2016-06-07 13:33 ` Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1465299136-8596-1-git-send-email-m.szyprowski@samsung.com \
--to=m.szyprowski@samsung$(echo .)com \
--cc=b.zolnierkie@samsung$(echo .)com \
--cc=broonie@kernel$(echo .)org \
--cc=javier@osg$(echo .)samsung.com \
--cc=k.debski@samsung$(echo .)com \
--cc=k.kozlowski@samsung$(echo .)com \
--cc=kgene@kernel$(echo .)org \
--cc=linaro-kernel@lists$(echo .)linaro.org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-media@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-samsung-soc@vger$(echo .)kernel.org \
--cc=s.nawrocki@samsung$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox