Commit 0d58cef6 authored by Amerigo Wang's avatar Amerigo Wang Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: Remove obsolete zc0301 v4l driver 



On 05/29/10 01:30, Jean-Francois Moine wrote:
> On Fri, 28 May 2010 13:03:28 -0400
> Amerigo Wang<amwang@redhat.com>  wrote:
>
>> Subject: [PATCH 6/6] Remove obsolete zc0301 v4l driver
>>
>> Duplicate functionality with the gspca_zc3xx driver, zc0301 only
>> supports 2 USB-ID's (because it only supports a limited set of
>> sensors) wich are also supported by the gspca_zc3xx driver
>> (which supports 53 USB-ID's in total).
>
> You forgot to remove the conditionnal compilation in the gspca_zc3xx
> driver (USB_DEVICE(0x046d, 0x08ae) in gspca/zc3xx.c)
>

Right, thanks for pointing this out!

Attached is the updated patch, please use this one instead.

Thanks!

Duplicate functionality with the gspca_zc3xx driver, zc0301 only
supports 2 USB-ID's (because it only supports a limited set of
sensors) wich are also supported by the gspca_zc3xx driver
(which supports 53 USB-ID's in total).

Signed-off-by: default avatarAmerigo Wang <amwang@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent a9607609

Documentation/feature-removal-schedule.txt

+0 −11
Original line number Diff line number Diff line
@@ -459,17 +459,6 @@ Who: Corentin Chary <corentin.chary@gmail.com> 


----------------------------



What:	zc0301 v4l driver

When:	2.6.35

Files:	drivers/media/video/zc0301/*

Why:	Duplicate functionality with the gspca_zc3xx driver, zc0301 only

	supports 2 USB-ID's (because it only supports a limited set of

	sensors) wich are also supported by the gspca_zc3xx driver

	(which supports 53 USB-ID's in total)

Who:	Hans de Goede <hdegoede@redhat.com>



----------------------------



What:	sysfs-class-rfkill state file

When:	Feb 2014

Files:	net/rfkill/core.c

drivers/media/video/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -1014,8 +1014,6 @@ config USB_SE401 


source "drivers/media/video/sn9c102/Kconfig"



source "drivers/media/video/zc0301/Kconfig"



source "drivers/media/video/pwc/Kconfig"



config USB_ZR364XX

drivers/media/video/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -133,7 +133,6 @@ obj-$(CONFIG_USB_STKWEBCAM) += stkwebcam.o 
obj-$(CONFIG_USB_SN9C102)       += sn9c102/

obj-$(CONFIG_USB_ET61X251)      += et61x251/

obj-$(CONFIG_USB_PWC)           += pwc/

obj-$(CONFIG_USB_ZC0301)        += zc0301/

obj-$(CONFIG_USB_GSPCA)         += gspca/



obj-$(CONFIG_VIDEO_HDPVR)	+= hdpvr/

drivers/media/video/gspca/zc3xx.c

+0 −2
Original line number Diff line number Diff line
@@ -7193,9 +7193,7 @@ static const __devinitdata struct usb_device_id device_table[] = { 
	{USB_DEVICE(0x046d, 0x08aa)},

	{USB_DEVICE(0x046d, 0x08ac)},

	{USB_DEVICE(0x046d, 0x08ad)},

#if !defined CONFIG_USB_ZC0301 && !defined CONFIG_USB_ZC0301_MODULE

	{USB_DEVICE(0x046d, 0x08ae)},

#endif

	{USB_DEVICE(0x046d, 0x08af)},

	{USB_DEVICE(0x046d, 0x08b9)},

	{USB_DEVICE(0x046d, 0x08d7)},

drivers/media/video/zc0301/Kconfig

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
config USB_ZC0301

	tristate "USB ZC0301[P] webcam support (DEPRECATED)"

	depends on VIDEO_V4L2

	default n

	---help---

	  This driver is DEPRECATED please use the gspca zc3xx module

	  instead.



	  Say Y here if you want support for cameras based on the ZC0301 or

	  ZC0301P Image Processors and Control Chips.



	  See <file:Documentation/video4linux/zc0301.txt> for more info.



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

	  module will be called zc0301.

CRA Git | Maintained and supported by SUSTech CRA and CCSE