Merge tag 'v4.4-rc1'

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

diff --git a/drivers/video/rockchip/Makefile b/drivers/video/rockchip/Makefile
index 0a2b769e0736ce7c8dbc258fa84cfa133a821fc5..8f8f8ce307f7ccf486624e9a45af07238f9a1729 100755 (executable)
--- a/drivers/video/rockchip/Makefile
+++ b/drivers/video/rockchip/Makefile
@@ -1,7 +1,12 @@
-obj-$(CONFIG_FB_ROCKCHIP) += rk_fb.o rkfb_sysfs.o
-obj-$(CONFIG_LCDC_RK30) += lcdc/rk30_lcdc.o 
-obj-$(CONFIG_LCDC_RK2928) += lcdc/rk2928_lcdc.o
-obj-$(CONFIG_LCDC_RK3066B) += lcdc/rk3066b_lcdc.o 
-obj-$(CONFIG_RGA_RK30) += rga/
+obj-$(CONFIG_ROCKCHIP_RGA) += rga/
+obj-$(CONFIG_ROCKCHIP_RGA2) += rga2/
+obj-$(CONFIG_FB_ROCKCHIP) += rk_fb.o rkfb_sysfs.o bmp_helper.o screen/
+obj-$(CONFIG_DRM_ROCKCHIP)  += rk_drm_fb.o screen/
+obj-$(CONFIG_RK_TRSM) += transmitter/
+obj-$(CONFIG_DRM_ROCKCHIP)  += lcdc/
+obj-$(CONFIG_FB_ROCKCHIP) += display-sys.o lcdc/
 obj-$(CONFIG_RK_HDMI) += hdmi/
-obj-$(CONFIG_RK_LVDS) += lvds/
+obj-$(CONFIG_IEP) += iep/
+obj-$(CONFIG_RK_TVENCODER) += tve/
+
+