diff --git a/[refs] b/[refs]
index 6de1372660d5..75f3599c0040 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a9db2036744676e0a9bf01522ef24140a591c0f0
+refs/heads/master: 3fc59af631643c9ea2d600e5a07b3fcaf4e38cbd
diff --git a/trunk/drivers/staging/tidspbridge/Kconfig b/trunk/drivers/staging/tidspbridge/Kconfig
index ff64d464143c..93de4f2e8bf8 100644
--- a/trunk/drivers/staging/tidspbridge/Kconfig
+++ b/trunk/drivers/staging/tidspbridge/Kconfig
@@ -6,7 +6,6 @@ menuconfig TIDSPBRIDGE
 	tristate "DSP Bridge driver"
 	depends on ARCH_OMAP3
 	select OMAP_MBOX_FWK
-	select OMAP_IOMMU
 	help
 	  DSP/BIOS Bridge is designed for platforms that contain a GPP and
 	  one or more attached DSPs.  The GPP is considered the master or