diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2016-02-20 03:58:43 +0300 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2016-02-20 03:58:43 +0300 |
commit | 4c4400504f6ada0cfed682fbe7e6c65efbda3952 (patch) | |
tree | 5452eb39c76081fc871abdf1a38ccf3668f5cb4f /drivers/media/platform/Makefile | |
parent | d2eaa59000c7717e68a75cf2c106f056d2bc30b4 (diff) | |
parent | 18922936dc2817488ebba985c5aaf3498f2ef96d (diff) | |
download | linux-4c4400504f6ada0cfed682fbe7e6c65efbda3952.tar.xz |
Merge remote-tracking branch 'linuxtv/vsp1' into HEAD
Diffstat (limited to 'drivers/media/platform/Makefile')
-rw-r--r-- | drivers/media/platform/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index efa0295af87b..bbb7bd1eb268 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -2,7 +2,6 @@ # Makefile for the video capture/playback device drivers. # -obj-$(CONFIG_VIDEO_TIMBERDALE) += timblogiw.o obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o @@ -18,6 +17,8 @@ obj-$(CONFIG_VIDEO_VIM2M) += vim2m.o obj-$(CONFIG_VIDEO_TI_VPE) += ti-vpe/ +obj-$(CONFIG_VIDEO_TI_CAL) += ti-vpe/ + obj-$(CONFIG_VIDEO_MX2_EMMAPRP) += mx2_emmaprp.o obj-$(CONFIG_VIDEO_CODA) += coda/ |