Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b6d45f1 authored Sep 14, 2011 by Joerg Roedel

iommu/omap: Fix build error with !IOMMU_SUPPORT

Without this patch it is possible to select the VIDEO_OMAP3
driver which then selects OMAP_IOVMM. But the omap iommu
driver is not compiled without IOMMU_SUPPORT enabled. Fix
that by forcing OMAP_IOMMU and OMAP_IOVMM are enabled before
VIDEO_OMAP3 can be selected.

Cc: Ohad Ben-Cohen <ohad@wizery.com>
Cc: iommu@lists.linux-foundation.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>

parent 5e1b612c

drivers/iommu/Kconfig

+2 −2

Original line number	Diff line number	Diff line
		@@ -114,8 +114,8 @@ config OMAP_IOMMU
		select IOMMU_API

		config OMAP_IOVMM
		tristate
		select OMAP_IOMMU
		tristate "OMAP IO Virtual Memory Manager Support"
		depends on OMAP_IOMMU

		config OMAP_IOMMU_DEBUG
		tristate "Export OMAP IOMMU/IOVMM internals in DebugFS"

drivers/media/video/Kconfig

+1 −2

Original line number	Diff line number	Diff line
		@@ -763,8 +763,7 @@ source "drivers/media/video/m5mols/Kconfig"

		config VIDEO_OMAP3
		tristate "OMAP 3 Camera support (EXPERIMENTAL)"
		select OMAP_IOVMM
		depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3 && EXPERIMENTAL
		depends on OMAP_IOVMM && VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3 && EXPERIMENTAL
		---help---
		Driver for an OMAP 3 camera controller.