OMAP: DSS2: omapfb driver

[karo-tx-linux.git] / drivers / video / omap / Kconfig

diff --git a/drivers/video/omap/Kconfig b/drivers/video/omap/Kconfig
index 551e3e9c4cbee0e3b43a246f0997b9787bf511a7..455c6055325dcae647858eb6cede512388f033dc 100644 (file)
--- a/drivers/video/omap/Kconfig
+++ b/drivers/video/omap/Kconfig
@@ -1,6 +1,7 @@
 config FB_OMAP
        tristate "OMAP frame buffer support (EXPERIMENTAL)"
-       depends on FB && ARCH_OMAP
+       depends on FB && ARCH_OMAP && (OMAP2_DSS = "n")
+
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@ -72,7 +73,7 @@ config FB_OMAP_LCD_MIPID
 
 config FB_OMAP_BOOTLOADER_INIT
        bool "Check bootloader initialization"
-       depends on FB_OMAP
+       depends on FB_OMAP || FB_OMAP2
        help
          Say Y here if you want to enable checking if the bootloader has
          already initialized the display controller. In this case the