diff options
| author | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2022-08-10 13:54:45 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@kernel.org> | 2022-08-29 15:33:45 +0200 |
| commit | 2a0c28063de23646bb56152095ce73ea2284dc26 (patch) | |
| tree | ca8413e91edcee5ab063195d916e7e524b90d6c3 /drivers/staging/media/Makefile | |
| parent | 90f6b6affd51a29df41686be3bde30b97ec94fd2 (diff) | |
media: zoran: move to mainline
The zoran driver can be moved back to mainline after it has been
converted by Corentin Labbe to vb2.
Note that the zoran driver no longer supports video output, but
video capture is working fine now.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Diffstat (limited to 'drivers/staging/media/Makefile')
| -rw-r--r-- | drivers/staging/media/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile index 950e96f10aad..7ece57ca0403 100644 --- a/drivers/staging/media/Makefile +++ b/drivers/staging/media/Makefile @@ -10,5 +10,4 @@ obj-$(CONFIG_VIDEO_SUNXI) += sunxi/ obj-$(CONFIG_VIDEO_TEGRA) += tegra-video/ obj-$(CONFIG_VIDEO_HANTRO) += hantro/ obj-$(CONFIG_VIDEO_IPU3_IMGU) += ipu3/ -obj-$(CONFIG_VIDEO_ZORAN) += zoran/ obj-$(CONFIG_DVB_AV7110) += av7110/ |