diff options
| author | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-07-13 18:43:48 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-07-13 18:43:48 +0200 |
| commit | c9a3429bcc5d9e2c0e416abd98e71ac50c54e8ea (patch) | |
| tree | b5397b054f75d7ba79c53b66056a6481d95836f6 /drivers/media/platform/Makefile | |
| parent | [media] tw686x: Support VIDIOC_{S,G}_PARM ioctls (diff) | |
| parent | [media] v4l: vsp1: wpf: Add flipping support (diff) | |
| download | linux-c9a3429bcc5d9e2c0e416abd98e71ac50c54e8ea.tar.xz linux-c9a3429bcc5d9e2c0e416abd98e71ac50c54e8ea.zip | |
Merge branch 'topic/vsp1' into patchwork
* topic/vsp1: (36 commits)
[media] v4l: vsp1: wpf: Add flipping support
[media] v4l: vsp1: rwpf: Support runtime modification of controls
[media] v4l: vsp1: Simplify alpha propagation
[media] v4l: vsp1: clu: Support runtime modification of controls
[media] v4l: vsp1: lut: Support runtime modification of controls
[media] v4l: vsp1: Support runtime modification of controls
[media] v4l: vsp1: Add Cubic Look Up Table (CLU) support
[media] v4l: vsp1: lut: Expose configuration through a control
[media] v4l: vsp1: lut: Initialize the mutex
[media] v4l: vsp1: dl: Don't free fragments with interrupts disabled
[media] v4l: vsp1: Set entities functions
[media] v4l: vsp1: Don't create LIF entity when the userspace API is enabled
[media] v4l: vsp1: Don't register media device when userspace API is disabled
[media] v4l: vsp1: Base link creation on availability of entities
[media] media: Add video statistics computation functions
[media] media: Add video processing entity functions
[media] v4l: vsp1: sru: Fix intensity control ID
[media] v4l: vsp1: Stop the pipeline upon the first STREAMOFF
[media] v4l: vsp1: Constify operation structures
[media] v4l: vsp1: pipe: Fix typo in comment
...
Diffstat (limited to 'drivers/media/platform/Makefile')
| -rw-r--r-- | drivers/media/platform/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index c6b3b9259a03..21771c1a13fb 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -46,6 +46,7 @@ obj-$(CONFIG_VIDEO_SH_VOU) += sh_vou.o obj-$(CONFIG_SOC_CAMERA) += soc_camera/ +obj-$(CONFIG_VIDEO_RENESAS_FCP) += rcar-fcp.o obj-$(CONFIG_VIDEO_RENESAS_JPU) += rcar_jpu.o obj-$(CONFIG_VIDEO_RENESAS_VSP1) += vsp1/ |