summaryrefslogtreecommitdiff
path: root/drivers/media/video/Kconfig
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2011-09-14 16:03:45 +0200
committerHiroshi DOYU <hdoyu@nvidia.com>2012-01-23 11:11:33 +0200
commit7f42887a91d20ed6ebe793fb02f5b56b7aee8120 (patch)
tree07a7b35ff01543f7553c234540312d738c266742 /drivers/media/video/Kconfig
parent1c56ebc94c64896343f5e6a7ee8dd03660efa9ee (diff)
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>
Diffstat (limited to 'drivers/media/video/Kconfig')
-rw-r--r--drivers/media/video/Kconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 386fb483bc4d..38719599a476 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -764,8 +764,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.