diff --git a/[refs] b/[refs]
index b77207eecf6c..6d8627c756d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4422c04bbb09f1864e2ce27296457f86d4167fe2
+refs/heads/master: b99ddbf83c064382b145d2156cc819d1eb4fc54d
diff --git a/trunk/drivers/video/omap/Kconfig b/trunk/drivers/video/omap/Kconfig
index 455c6055325d..083c8fe53e24 100644
--- a/trunk/drivers/video/omap/Kconfig
+++ b/trunk/drivers/video/omap/Kconfig
@@ -1,7 +1,7 @@
 config FB_OMAP
 	tristate "OMAP frame buffer support (EXPERIMENTAL)"
-	depends on FB && ARCH_OMAP && (OMAP2_DSS = "n")
-
+	depends on FB && (OMAP2_DSS = "n")
+	depends on ARCH_OMAP1 || ARCH_OMAP2 || ARCH_OMAP3
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT