From 70c8b36a1c5b732252d9ab68120690d4abef1282 Mon Sep 17 00:00:00 2001
From: Joerg Roedel <joerg.roedel@amd.com>
Date: Wed, 14 Sep 2011 16:03:45 +0200
Subject: [PATCH] --- yaml --- r: 271567 b: refs/heads/master c:
 7b6d45f139262aa7b1b604a67963e5c8c01304d3 h: refs/heads/master i:   271565:
 04aa5af5accf79bc7ce35460005a3e30ddd4d9f1   271563:
 2a7dc17da0c0094a355cdc32330c9d2aa1d27dbd   271559:
 83243b1b0c5ec345f1fc27eecabfc004309431ee   271551:
 fa68e7a77c3c27dba1f667039dd6b3be61c81049 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/iommu/Kconfig       | 4 ++--
 trunk/drivers/media/video/Kconfig | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 9b108655ecb4..7f233c448c81 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e1b612cb16f446996398bd23b6cd59ea0206938
+refs/heads/master: 7b6d45f139262aa7b1b604a67963e5c8c01304d3
diff --git a/trunk/drivers/iommu/Kconfig b/trunk/drivers/iommu/Kconfig
index d901930a8f83..ae46776c1b80 100644
--- a/trunk/drivers/iommu/Kconfig
+++ b/trunk/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/trunk/drivers/media/video/Kconfig b/trunk/drivers/media/video/Kconfig
index 6a25fad56655..620106937ec6 100644
--- a/trunk/drivers/media/video/Kconfig
+++ b/trunk/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.