summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2007-10-30 00:37:16 +0300
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-30 18:06:55 +0300
commitf08f3895f4171d336c52d37a81376a910a1673e0 (patch)
treec38f988042a46197462ad778905d2aa7a28df1f3
parent64e862a579015d229b8e40b6bc4ac3612e9656e1 (diff)
downloadlinux-f08f3895f4171d336c52d37a81376a910a1673e0.tar.xz
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>
-rw-r--r--drivers/video/Kconfig4
-rw-r--r--drivers/video/omap/Kconfig2
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index fb9d8d0b2c04..61717fa1afb9 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 f4fcf11b290d..44408850e2eb 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