aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/drivers/media/platform/Makefile
diff options
context:
space:
mode:
authorBenoit Parrot <bparrot@ti.com>2019-10-07 12:09:49 -0300
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-10-10 11:39:32 -0300
commit5139de5d5e60aeb38146a8bf5bfaa09c54a8eeb7 (patch)
tree26368c90ae43729b5b9b20c013423693e3b9d9f7 /drivers/media/platform/Makefile
parentmedia: imx214: Add new control with V4L2_CID_UNIT_CELL_SIZE (diff)
downloadwireguard-linux-5139de5d5e60aeb38146a8bf5bfaa09c54a8eeb7.tar.xz
wireguard-linux-5139de5d5e60aeb38146a8bf5bfaa09c54a8eeb7.zip
media: ti-vpe: Fix a parallel build issue
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>
Diffstat (limited to 'drivers/media/platform/Makefile')
-rw-r--r--drivers/media/platform/Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 6ee7eb0d36f4..d13db96e3015 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -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/