]> git.baikalelectronics.ru Git - kernel.git/commit
media: zoran: move to mainline
authorHans Verkuil <hverkuil-cisco@xs4all.nl>
Wed, 10 Aug 2022 11:54:45 +0000 (13:54 +0200)
committerMauro Carvalho Chehab <mchehab@kernel.org>
Mon, 29 Aug 2022 13:33:45 +0000 (15:33 +0200)
commit033b7ef739cdd057325e5862bd752ca297048e16
treeca8413e91edcee5ab063195d916e7e524b90d6c3
parent522d1335275f4c7dfa0e8b7a543996e6e4d78842
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>
39 files changed:
drivers/media/pci/Kconfig
drivers/media/pci/Makefile
drivers/media/pci/zoran/Kconfig [new file with mode: 0644]
drivers/media/pci/zoran/Makefile [new file with mode: 0644]
drivers/media/pci/zoran/videocodec.c [new file with mode: 0644]
drivers/media/pci/zoran/videocodec.h [new file with mode: 0644]
drivers/media/pci/zoran/zoran.h [new file with mode: 0644]
drivers/media/pci/zoran/zoran_card.c [new file with mode: 0644]
drivers/media/pci/zoran/zoran_card.h [new file with mode: 0644]
drivers/media/pci/zoran/zoran_device.c [new file with mode: 0644]
drivers/media/pci/zoran/zoran_device.h [new file with mode: 0644]
drivers/media/pci/zoran/zoran_driver.c [new file with mode: 0644]
drivers/media/pci/zoran/zr36016.c [new file with mode: 0644]
drivers/media/pci/zoran/zr36016.h [new file with mode: 0644]
drivers/media/pci/zoran/zr36050.c [new file with mode: 0644]
drivers/media/pci/zoran/zr36050.h [new file with mode: 0644]
drivers/media/pci/zoran/zr36057.h [new file with mode: 0644]
drivers/media/pci/zoran/zr36060.c [new file with mode: 0644]
drivers/media/pci/zoran/zr36060.h [new file with mode: 0644]
drivers/staging/media/Kconfig
drivers/staging/media/Makefile
drivers/staging/media/zoran/Kconfig [deleted file]
drivers/staging/media/zoran/Makefile [deleted file]
drivers/staging/media/zoran/TODO [deleted file]
drivers/staging/media/zoran/videocodec.c [deleted file]
drivers/staging/media/zoran/videocodec.h [deleted file]
drivers/staging/media/zoran/zoran.h [deleted file]
drivers/staging/media/zoran/zoran_card.c [deleted file]
drivers/staging/media/zoran/zoran_card.h [deleted file]
drivers/staging/media/zoran/zoran_device.c [deleted file]
drivers/staging/media/zoran/zoran_device.h [deleted file]
drivers/staging/media/zoran/zoran_driver.c [deleted file]
drivers/staging/media/zoran/zr36016.c [deleted file]
drivers/staging/media/zoran/zr36016.h [deleted file]
drivers/staging/media/zoran/zr36050.c [deleted file]
drivers/staging/media/zoran/zr36050.h [deleted file]
drivers/staging/media/zoran/zr36057.h [deleted file]
drivers/staging/media/zoran/zr36060.c [deleted file]
drivers/staging/media/zoran/zr36060.h [deleted file]