From patchwork Tue Jun 7 11:32:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 69495 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp1926879qgf; Tue, 7 Jun 2016 04:32:36 -0700 (PDT) X-Received: by 10.36.123.77 with SMTP id q74mr3019842itc.42.1465299156619; Tue, 07 Jun 2016 04:32:36 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s63si34623611pfd.27.2016.06.07.04.32.34; Tue, 07 Jun 2016 04:32:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-samsung-soc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753732AbcFGLcc (ORCPT + 4 others); Tue, 7 Jun 2016 07:32:32 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:56190 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751103AbcFGLcb (ORCPT ); Tue, 7 Jun 2016 07:32:31 -0400 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>; 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 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 , Sylwester Nawrocki , Kamil Debski , Kukjin Kim , Krzysztof Kozlowski , Javier Martinez Canillas , Bartlomiej Zolnierkiewicz , Mark Brown , 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 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= Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org 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 --- drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.9.2 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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