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/media/pci/Kconfig | |
parent | media: zoran: from VB2_READ/WRITE: read/write isn't supported (diff) | |
download | linux-dev-2a0c28063de23646bb56152095ce73ea2284dc26.tar.xz linux-dev-2a0c28063de23646bb56152095ce73ea2284dc26.zip |
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/media/pci/Kconfig')
-rw-r--r-- | drivers/media/pci/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/pci/Kconfig b/drivers/media/pci/Kconfig index 1224d908713a..7a229dddadaf 100644 --- a/drivers/media/pci/Kconfig +++ b/drivers/media/pci/Kconfig @@ -19,6 +19,7 @@ source "drivers/media/pci/sta2x11/Kconfig" source "drivers/media/pci/tw5864/Kconfig" source "drivers/media/pci/tw68/Kconfig" source "drivers/media/pci/tw686x/Kconfig" +source "drivers/media/pci/zoran/Kconfig" endif |