Merge branch 'develop-3.0' of ssh://rk29/rk/kernel into develop-3.0

[firefly-linux-kernel-4.4.55.git] / drivers / video / Kconfig

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 975175ecb1605e320a2d672d1ef85cc5d5e5665b..47d5735793ba4f11a391c2205ef5817772f274a0 100755 (executable)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -2118,6 +2118,10 @@ config CLOSE_WIN1_DYNAMIC
        ---help---
                this function  can close win1 when video and it have no data in fb0
 
+config FB_WIMO
+       bool "WiMo support"
+       depends on FB_RK29
+
 config FB_NUC900
         bool "NUC900 LCD framebuffer support"
         depends on FB && ARCH_W90X900
@@ -2434,7 +2438,12 @@ source "drivers/video/omap2/Kconfig"
 
 source "drivers/video/backlight/Kconfig"
 source "drivers/video/display/Kconfig"
+
+if !LCDC_RK30 && !LCDC_RK2928
 source "drivers/video/hdmi/Kconfig"
+endif
+
+source "drivers/video/rockchip/Kconfig"
 
 if VT
        source "drivers/video/console/Kconfig"