Message ID | 1465299136-8596-1-git-send-email-m.szyprowski@samsung.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 519FE60467 for <patchwork-linux-arm@patchwork.kernel.org>; Tue, 7 Jun 2016 11:34:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 419AA2793B for <patchwork-linux-arm@patchwork.kernel.org>; Tue, 7 Jun 2016 11:34:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3679F281F9; Tue, 7 Jun 2016 11:34:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D169E2793B for <patchwork-linux-arm@patchwork.kernel.org>; Tue, 7 Jun 2016 11:34:17 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1bAFFe-0003vM-Hg; Tue, 07 Jun 2016 11:32:54 +0000 Received: from mailout3.w1.samsung.com ([210.118.77.13]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1bAFFb-0003qf-F5 for linux-arm-kernel@lists.infradead.org; Tue, 07 Jun 2016 11:32:52 +0000 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0O8E00CG7G23NG30@mailout3.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 07 Jun 2016 12:32:27 +0100 (BST) X-AuditID: cbfec7f4-f796c6d000001486-14-5756b0cb6de5 Received: from eusync3.samsung.com ( [203.254.199.213]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id 28.23.05254.BC0B6575; Tue, 7 Jun 2016 12:32:27 +0100 (BST) Received: from amdc1339.digital.local ([106.116.147.30]) by eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0O8E00L3OG1WLA10@eusync3.samsung.com>; Tue, 07 Jun 2016 12:32:27 +0100 (BST) 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 Subject: [PATCH] media: s5p-mfc: fix compilation issue on archs other than ARM (32bit) Date: Tue, 07 Jun 2016 13:32:16 +0200 Message-id: <1465299136-8596-1-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.2 In-reply-to: <20160607105823.GT7510@sirena.org.uk> References: <20160607105823.GT7510@sirena.org.uk> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrGLMWRmVeSWpSXmKPExsVy+t/xq7qnN4SFG6w6qmSxccZ6VoupD5+w Wbx5u4bJ4sfrC2wWr18YWvQ/fs1s8f7QM2aLTY+vsVr0bNjKanFwYRujxYzz+5gs1h65y25x +E07qwOvx6ZVnWwem5fUe9z+95jZY0v/XXaPvi2rGD0+b5ILYIvisklJzcksSy3St0vgyjjS NIO9YDFbxcHO+SwNjDtYuxg5OSQETCR2v3/EAmGLSVy4t56ti5GLQ0hgKaPErXnrmUESQgJN TBJ/FhWB2GwChhJdb7vAikQE2hglJn/bzA7iMAu0Mkvc/tDHDlIlLBAhMaHtMSOIzSKgKrGk 5RcbiM0r4C7x4/0UqHVyEv9frmACsTkFjCQenH/LDrENaMOPzUwTGHkXMDKsYhRNLU0uKE5K zzXUK07MLS7NS9dLzs/dxAgJzS87GBcfszrEKMDBqMTDK/A9NFyINbGsuDL3EKMEB7OSCG/C 2rBwId6UxMqq1KL8+KLSnNTiQ4zSHCxK4rxzd70PERJITyxJzU5NLUgtgskycXBKNTAy1/PE /NrWvkqCYemS9Zv+TvP/9fVn4OofvO6/DryUYWDbVWh15cCdwKelhgqhf0v+BN/PWvDm+KyA eyyJUmu3/v+iY7KJIUYhVbIv5e05gy0Hlsvsahb0fMzoxF2R6rwmvm3NzxVNlo9Xna4ot63m 3m559e32A66B7sFzbq2JnszS+mta5d7LSizFGYmGWsxFxYkAg70Ag0kCAAA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160607_043251_655601_9EBC97DC X-CRM114-Status: GOOD ( 11.97 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Cc: Kamil Debski <k.debski@samsung.com>, linaro-kernel@lists.linaro.org, Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>, Mark Brown <broonie@kernel.org>, Krzysztof Kozlowski <k.kozlowski@samsung.com>, Javier Martinez Canillas <javier@osg.samsung.com>, Kukjin Kim <kgene@kernel.org>, Sylwester Nawrocki <s.nawrocki@samsung.com>, Marek Szyprowski <m.szyprowski@samsung.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP |
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>
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(-)