Merge branch 'develop-3.10-next' of 10.10.10.29:rk/kernel into develop-3.10-next

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

diff --git a/drivers/video/rockchip/Kconfig b/drivers/video/rockchip/Kconfig
index cd5db950da193d45ed5df3acc7514a1ca7dd77f2..6034139cacf2ff673de7b4fd1b525a4e9d94bce0 100755 (executable)
--- a/drivers/video/rockchip/Kconfig
+++ b/drivers/video/rockchip/Kconfig
@@ -60,7 +60,7 @@ config THREE_FB_BUFFER
 
 
 source "drivers/video/rockchip/lcdc/Kconfig"
-#source "drivers/video/rockchip/screen/Kconfig"
+source "drivers/video/rockchip/screen/Kconfig"
 source "drivers/video/rockchip/transmitter/Kconfig"
 source "drivers/video/rockchip/hdmi/Kconfig"
 source "drivers/video/rockchip/tve/Kconfig"