Merge tag 'media/v4.15-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mcheh...

[linux-2.6-block.git] / drivers / media / platform / Makefile

diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 327f80a6f82c0819e24b630e4b64fb2900eb3b24..003b0bb2cddf1389813674354eaf3d9a247f9248 100644 (file)
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -27,6 +27,8 @@ obj-$(CONFIG_VIDEO_CODA)              += coda/
 
 obj-$(CONFIG_VIDEO_SH_VEU)             += sh_veu.o
 
+obj-$(CONFIG_CEC_GPIO)                 += cec-gpio/
+
 obj-$(CONFIG_VIDEO_MEM2MEM_DEINTERLACE)        += m2m-deinterlace.o
 
 obj-$(CONFIG_VIDEO_MUX)                        += video-mux.o
@@ -47,6 +49,8 @@ obj-$(CONFIG_VIDEO_STI_HDMI_CEC)      += sti/cec/
 
 obj-$(CONFIG_VIDEO_STI_DELTA)          += sti/delta/
 
+obj-$(CONFIG_VIDEO_TEGRA_HDMI_CEC)     += tegra-cec/
+
 obj-y                                  += stm32/
 
 obj-y                                   += blackfin/
@@ -63,6 +67,8 @@ obj-$(CONFIG_VIDEO_RENESAS_FDP1)      += rcar_fdp1.o
 obj-$(CONFIG_VIDEO_RENESAS_JPU)        += rcar_jpu.o
 obj-$(CONFIG_VIDEO_RENESAS_VSP1)       += vsp1/
 
+obj-$(CONFIG_VIDEO_ROCKCHIP_RGA)       += rockchip/rga/
+
 obj-y  += omap/
 
 obj-$(CONFIG_VIDEO_AM437X_VPFE)                += am437x/