[media] usbvideo: deprecate the vicam driver

Move usbvideo to staging and mark it deprecated.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 4b751ef47a83d518d39a15aa5451a8eb886dcd6b..3655b30254d9504f41fb4c96e32d51764c8550dd 100644 (file)
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -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

diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index ace7b6eaf5b87fa6173a99d786ea6d4afc40ecef..2f2e3ac877b4686c1bf0e7293f2b96f507d6c383 100644 (file)
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -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/

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 5eafdf435550fb307d9423c602a50f78be0ca471..a402a5614b869b0e83cabb9164d314d9ec693601 100644 (file)
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -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"

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index a97a955c094bc8aa0f8142917f2ece87ecb01eac..d4eb7146a87c4fd2999a0d4b43a6c58cedb4328c 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -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/

diff --git a/drivers/media/video/usbvideo/Kconfig b/drivers/staging/usbvideo/Kconfig
similarity index 59%
rename from drivers/media/video/usbvideo/Kconfig
rename to drivers/staging/usbvideo/Kconfig
index 357860d42a8b3906741680d2c0547e37fc1d5c15..aae863e8a902a8e94bc191cd2956b480ced80995 100644 (file)
--- a/drivers/media/video/usbvideo/Kconfig
+++ b/drivers/staging/usbvideo/Kconfig
@@ -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.

diff --git a/drivers/media/video/usbvideo/Makefile b/drivers/staging/usbvideo/Makefile
similarity index 100%
rename from drivers/media/video/usbvideo/Makefile
rename to drivers/staging/usbvideo/Makefile

diff --git a/drivers/media/video/usbvideo/usbvideo.c b/drivers/staging/usbvideo/usbvideo.c
similarity index 100%
rename from drivers/media/video/usbvideo/usbvideo.c
rename to drivers/staging/usbvideo/usbvideo.c

diff --git a/drivers/media/video/usbvideo/usbvideo.h b/drivers/staging/usbvideo/usbvideo.h
similarity index 100%
rename from drivers/media/video/usbvideo/usbvideo.h
rename to drivers/staging/usbvideo/usbvideo.h

diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/staging/usbvideo/vicam.c
similarity index 100%
rename from drivers/media/video/usbvideo/vicam.c
rename to drivers/staging/usbvideo/vicam.c