All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] iommu/omap: Fix build error with !IOMMU_SUPPORT
@ 2011-09-14 14:07 ` Joerg Roedel
  0 siblings, 0 replies; 10+ messages in thread
From: Joerg Roedel @ 2011-09-14 14:07 UTC (permalink / raw)
  To: linux-omap; +Cc: Joerg Roedel, Ohad Ben-Cohen, iommu, linux-kernel

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>
---
 drivers/iommu/Kconfig       |    4 ++--
 drivers/media/video/Kconfig |    3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index d901930..ae46776 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -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"
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 6a25fad..6201069 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -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.
 
-- 
1.7.4.1



^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2011-09-23  9:06 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-09-14 14:07 [PATCH] iommu/omap: Fix build error with !IOMMU_SUPPORT Joerg Roedel
2011-09-14 14:07 ` Joerg Roedel
2011-09-14 18:57 ` Ohad Ben-Cohen
2011-09-15 10:45   ` Roedel, Joerg
2011-09-16  9:57     ` Ohad Ben-Cohen
2011-09-18  0:02 ` Laurent Pinchart
2011-09-20 10:01   ` Roedel, Joerg
2011-09-20 10:54     ` Laurent Pinchart
2011-09-22 13:48       ` Felipe Contreras
2011-09-23  9:05         ` Roedel, Joerg

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.