]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
media: ti-vpe: Fix a parallel build issue
authorBenoit Parrot <bparrot@ti.com>
Mon, 7 Oct 2019 15:09:49 +0000 (12:09 -0300)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Thu, 10 Oct 2019 14:39:32 +0000 (11:39 -0300)
When TI CAL was introduce as another driver under platform/ti-vpe
adding a second entry into the ti-vpe directory in the platform
Makefile caused issues during parallel build.

Signed-off-by: Benoit Parrot <bparrot@ti.com>
Signed-off-by: Jyri Sarha <jsarha@ti.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/media/platform/Makefile

index 6ee7eb0d36f432f0ac9eb48e6553b05a09029aa1..d13db96e30153034786a13573707d014e6505541 100644 (file)
@@ -19,9 +19,7 @@ obj-$(CONFIG_VIDEO_VIVID)             += vivid/
 obj-$(CONFIG_VIDEO_VIM2M)              += vim2m.o
 obj-$(CONFIG_VIDEO_VICODEC)            += vicodec/
 
-obj-$(CONFIG_VIDEO_TI_VPE)             += ti-vpe/
-
-obj-$(CONFIG_VIDEO_TI_CAL)             += ti-vpe/
+obj-y  += ti-vpe/
 
 obj-$(CONFIG_VIDEO_MX2_EMMAPRP)                += mx2_emmaprp.o
 obj-$(CONFIG_VIDEO_CODA)               += coda/