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 06340ac49846d2a564cb7b05591f844dfba402e3..6034139cacf2ff673de7b4fd1b525a4e9d94bce0 100755 (executable)
--- a/drivers/video/rockchip/Kconfig
+++ b/drivers/video/rockchip/Kconfig
@@ -65,4 +65,6 @@ source "drivers/video/rockchip/transmitter/Kconfig"
 source "drivers/video/rockchip/hdmi/Kconfig"
 source "drivers/video/rockchip/tve/Kconfig"
 source "drivers/video/rockchip/rga/Kconfig"
+source "drivers/video/rockchip/rga2/Kconfig"
+source "drivers/video/rockchip/iep/Kconfig"