diff --git a/[refs] b/[refs]
index 9bc721e99b1e..18d8e0bf3030 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d92bbe634cc9d768db2b88ca7c303e6799ed5c0
+refs/heads/master: 26711113c4e4e72a72d347bfc33590595f248df7
diff --git a/trunk/drivers/media/platform/omap/Kconfig b/trunk/drivers/media/platform/omap/Kconfig
index 390ab094f9f2..37ad446b35b3 100644
--- a/trunk/drivers/media/platform/omap/Kconfig
+++ b/trunk/drivers/media/platform/omap/Kconfig
@@ -6,7 +6,7 @@ config VIDEO_OMAP2_VOUT
 	depends on ARCH_OMAP2 || ARCH_OMAP3
 	select VIDEOBUF_GEN
 	select VIDEOBUF_DMA_CONTIG
-	select OMAP2_DSS
+	select OMAP2_DSS if HAS_IOMEM && ARCH_OMAP2PLUS
 	select OMAP2_VRFB if ARCH_OMAP2 || ARCH_OMAP3
 	select VIDEO_OMAP2_VOUT_VRFB if VIDEO_OMAP2_VOUT && OMAP2_VRFB
 	default n