Commit 745da428 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] usbvideo: deprecate the vicam driver 



Move usbvideo to staging and mark it deprecated.

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 5772dcaa

drivers/media/video/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -915,8 +915,6 @@ source "drivers/media/video/cx231xx/Kconfig" 


source "drivers/media/video/usbvision/Kconfig"



source "drivers/media/video/usbvideo/Kconfig"



source "drivers/media/video/et61x251/Kconfig"



config USB_SE401

drivers/media/video/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -133,10 +133,6 @@ obj-$(CONFIG_USB_GSPCA) += gspca/ 


obj-$(CONFIG_VIDEO_HDPVR)	+= hdpvr/



obj-$(CONFIG_USB_IBMCAM)        += usbvideo/

obj-$(CONFIG_USB_KONICAWC)      += usbvideo/

obj-$(CONFIG_USB_VICAM)         += usbvideo/

obj-$(CONFIG_USB_QUICKCAM_MESSENGER)	+= usbvideo/

obj-$(CONFIG_USB_S2255)		+= s2255drv.o



obj-$(CONFIG_VIDEO_IVTV) += ivtv/

drivers/staging/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ source "drivers/staging/cpia/Kconfig" 


source "drivers/staging/stradis/Kconfig"



source "drivers/staging/usbvideo/Kconfig"



source "drivers/staging/usbip/Kconfig"



source "drivers/staging/winbond/Kconfig"

drivers/staging/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ obj-$(CONFIG_VIDEO_CX25821) += cx25821/ 
obj-$(CONFIG_VIDEO_TM6000)	+= tm6000/

obj-$(CONFIG_VIDEO_CPIA)	+= cpia/

obj-$(CONFIG_VIDEO_STRADIS)	+= stradis/

obj-$(CONFIG_USB_VICAM)         += usbvideo/

obj-$(CONFIG_LIRC_STAGING)	+= lirc/

obj-$(CONFIG_USB_IP_COMMON)	+= usbip/

obj-$(CONFIG_W35UND)		+= winbond/

drivers/media/video/usbvideo/Kconfig→drivers/staging/usbvideo/Kconfig

+4 −1
Original line number Diff line number Diff line
@@ -2,11 +2,14 @@ config VIDEO_USBVIDEO 
	tristate



config USB_VICAM

	tristate "USB 3com HomeConnect (aka vicam) support (EXPERIMENTAL)"

	tristate "USB 3com HomeConnect (aka vicam) support (DEPRECATED)"

	depends on VIDEO_V4L1 && EXPERIMENTAL

	select VIDEO_USBVIDEO

	---help---

	  Say Y here if you have 3com homeconnect camera (vicam).



	  This driver uses the deprecated V4L1 API and will be removed in

	  2.6.39, unless someone converts it to the V4L2 API.



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

	  module will be called vicam.