From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Mon, 29 Oct 2007 21:37:16 +0000 (-0700)
Subject: fb menu: fix FB_OMAP dependencies so that menu is displayed correctly
X-Git-Tag: v2.6.24-rc2~89
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f08f3895f4171d336c52d37a81376a910a1673e0;p=thirdparty%2Fkernel%2Flinux.git

fb menu: fix FB_OMAP dependencies so that menu is displayed correctly

Fix FB_OMAP dependencies so that the OMAP FB driver options are presented
correctly.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index fb9d8d0b2c045..61717fa1afb91 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1892,9 +1892,7 @@ config FB_VIRTUAL
 
 	  If unsure, say N.
 
-if ARCH_OMAP
-	source "drivers/video/omap/Kconfig"
-endif
+source "drivers/video/omap/Kconfig"
 
 source "drivers/video/backlight/Kconfig"
 source "drivers/video/display/Kconfig"
diff --git a/drivers/video/omap/Kconfig b/drivers/video/omap/Kconfig
index f4fcf11b290d0..44408850e2ebc 100644
--- a/drivers/video/omap/Kconfig
+++ b/drivers/video/omap/Kconfig
@@ -1,6 +1,6 @@
 config FB_OMAP
 	tristate "OMAP frame buffer support (EXPERIMENTAL)"
-	depends on FB
+	depends on FB && ARCH_OMAP
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT