From abb6a85f077757e5d30f9507406fc533ea4954ee Mon Sep 17 00:00:00 2001 From: Hiroshi DOYU Date: Tue, 24 Jul 2012 12:48:50 +0300 Subject: video: tegra: nvmap: Fix breakage for T20 NVMAP_CONVERT_CARVEOUT_TO_IOVMM is only available for IOMMU less SoCs. This was introduced by (in 'main'): commit b8b0b4c42fc77d94b8deadaa46f795784f3bbb5e video: tegra: nvmap: Make IOMMU/IOVMM selectable in Kconfig Bug 1017112 Change-Id: I2a6f101b15085ece600f77690bc77adc042eb29f Reviewed-on: http://git-master/r/117976 (cherry picked from commit a68ae587edbc3ca5d3216d39c462abd84f469027) Reviewed-on: http://git-master/r/121409 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Hiroshi Doyu GVS: Gerrit_Virtual_Submit Reviewed-by: Matthew Pedro Tested-by: Matthew Pedro --- drivers/video/tegra/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/video/tegra') diff --git a/drivers/video/tegra/Kconfig b/drivers/video/tegra/Kconfig index 6109078deb47..b5540a5793b2 100644 --- a/drivers/video/tegra/Kconfig +++ b/drivers/video/tegra/Kconfig @@ -143,7 +143,7 @@ config TEGRA_DSI config NVMAP_CONVERT_CARVEOUT_TO_IOVMM bool "Convert carveout to IOVMM" - depends on TEGRA_NVMAP && (TEGRA_IOVMM || IOMMU_API) + depends on TEGRA_NVMAP && (TEGRA_IOVMM_SMMU || IOMMU_API) default y help Say Y here to force to convert carveout memory requests to -- cgit v1.2.3