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 ce7ba837987f7b9cf435de5356445aa7158396a3..47d5735793ba4f11a391c2205ef5817772f274a0 100755 (executable)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -2438,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"