Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8dce4b26 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: zoran: remove deprecated driver 



The zoran driver has been marked deprecated for a year now
without any interest to update this driver to the vb2 framework.

Time to remove it altogether.

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent a4dfc8a2

Documentation/media/v4l-drivers/index.rst

+0 −1
Original line number Diff line number Diff line
@@ -65,5 +65,4 @@ For more details see the file COPYING in the source distribution of Linux. 
	soc-camera

	uvcvideo

	vivid

	zoran

	zr364xx

Documentation/media/v4l-drivers/zoran.rst

deleted100644 → 0
+0 −583

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/staging/media/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ source "drivers/staging/media/sunxi/Kconfig" 


source "drivers/staging/media/tegra-vde/Kconfig"



source "drivers/staging/media/zoran/Kconfig"



source "drivers/staging/media/ipu3/Kconfig"



source "drivers/staging/media/soc_camera/Kconfig"

drivers/staging/media/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ obj-$(CONFIG_VIDEO_DM365_VPFE) += davinci_vpfe/ 
obj-$(CONFIG_VIDEO_OMAP4)	+= omap4iss/

obj-$(CONFIG_VIDEO_SUNXI)	+= sunxi/

obj-$(CONFIG_TEGRA_VDE)		+= tegra-vde/

obj-$(CONFIG_VIDEO_ZORAN)	+= zoran/

obj-$(CONFIG_VIDEO_ROCKCHIP_VPU) += rockchip/vpu/

obj-$(CONFIG_VIDEO_IPU3_IMGU)	+= ipu3/

obj-$(CONFIG_SOC_CAMERA)	+= soc_camera/

drivers/staging/media/zoran/Kconfig

deleted100644 → 0
+0 −75
Original line number Diff line number Diff line 
config VIDEO_ZORAN

	tristate "Zoran ZR36057/36067 Video For Linux (Deprecated)"

	depends on PCI && I2C_ALGOBIT && VIDEO_V4L2 && VIRT_TO_BUS

	depends on !ALPHA

	help

	  Say Y for support for MJPEG capture cards based on the Zoran

	  36057/36067 PCI controller chipset. This includes the Iomega

	  Buz, Pinnacle DC10+ and the Linux Media Labs LML33. There is

	  a driver homepage at <http://mjpeg.sf.net/driver-zoran/>. For

	  more information, check <file:Documentation/media/v4l-drivers/zoran.rst>.



	  To compile this driver as a module, choose M here: the

	  module will be called zr36067.



config VIDEO_ZORAN_DC30

	tristate "Pinnacle/Miro DC30(+) support"

	depends on VIDEO_ZORAN

	select VIDEO_ADV7175 if MEDIA_SUBDRV_AUTOSELECT

	select VIDEO_VPX3220 if MEDIA_SUBDRV_AUTOSELECT

	help

	  Support for the Pinnacle/Miro DC30(+) MJPEG capture/playback

	  card. This also supports really old DC10 cards based on the

	  zr36050 MJPEG codec and zr36016 VFE.



config VIDEO_ZORAN_ZR36060

	tristate "Zoran ZR36060"

	depends on VIDEO_ZORAN

	help

	  Say Y to support Zoran boards based on 36060 chips.

	  This includes Iomega Buz, Pinnacle DC10, Linux media Labs 33

	  and 33 R10 and AverMedia 6 boards.



config VIDEO_ZORAN_BUZ

	tristate "Iomega Buz support"

	depends on VIDEO_ZORAN_ZR36060

	select VIDEO_SAA711X if MEDIA_SUBDRV_AUTOSELECT

	select VIDEO_SAA7185 if MEDIA_SUBDRV_AUTOSELECT

	help

	  Support for the Iomega Buz MJPEG capture/playback card.



config VIDEO_ZORAN_DC10

	tristate "Pinnacle/Miro DC10(+) support"

	depends on VIDEO_ZORAN_ZR36060

	select VIDEO_SAA7110 if MEDIA_SUBDRV_AUTOSELECT

	select VIDEO_ADV7175 if MEDIA_SUBDRV_AUTOSELECT

	help

	  Support for the Pinnacle/Miro DC10(+) MJPEG capture/playback

	  card.



config VIDEO_ZORAN_LML33

	tristate "Linux Media Labs LML33 support"

	depends on VIDEO_ZORAN_ZR36060

	select VIDEO_BT819 if MEDIA_SUBDRV_AUTOSELECT

	select VIDEO_BT856 if MEDIA_SUBDRV_AUTOSELECT

	help

	  Support for the Linux Media Labs LML33 MJPEG capture/playback

	  card.



config VIDEO_ZORAN_LML33R10

	tristate "Linux Media Labs LML33R10 support"

	depends on VIDEO_ZORAN_ZR36060

	select VIDEO_SAA711X if MEDIA_SUBDRV_AUTOSELECT

	select VIDEO_ADV7170 if MEDIA_SUBDRV_AUTOSELECT

	help

	  support for the Linux Media Labs LML33R10 MJPEG capture/playback

	  card.



config VIDEO_ZORAN_AVS6EYES

	tristate "AverMedia 6 Eyes support"

	depends on VIDEO_ZORAN_ZR36060

	select VIDEO_BT856 if MEDIA_SUBDRV_AUTOSELECT

	select VIDEO_BT866 if MEDIA_SUBDRV_AUTOSELECT

	select VIDEO_KS0127 if MEDIA_SUBDRV_AUTOSELECT

	help

	  Support for the AverMedia 6 Eyes video surveillance card.