9 files changed, 7 insertions, 7 deletions

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 4b751ef47a83..3655b30254d9 100644
--- 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 ace7b6eaf5b8..2f2e3ac877b4 100644
--- 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 5eafdf435550..a402a5614b86 100644
--- 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 a97a955c094b..d4eb7146a87c 100644
--- 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
index 357860d42a8b..aae863e8a902 100644
--- 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
index 3c99a9a2d8d3..3c99a9a2d8d3 100644
--- a/drivers/media/video/usbvideo/Makefile
+++ b/drivers/staging/usbvideo/Makefile
diff --git a/drivers/media/video/usbvideo/usbvideo.c b/drivers/staging/usbvideo/usbvideo.c
index f1fcf9744961..f1fcf9744961 100644
--- a/drivers/media/video/usbvideo/usbvideo.c
+++ b/drivers/staging/usbvideo/usbvideo.c
diff --git a/drivers/media/video/usbvideo/usbvideo.h b/drivers/staging/usbvideo/usbvideo.h
index c66985beb8c9..c66985beb8c9 100644
--- a/drivers/media/video/usbvideo/usbvideo.h
+++ b/drivers/staging/usbvideo/usbvideo.h
diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/staging/usbvideo/vicam.c
index dc17cce2fbb6..dc17cce2fbb6 100644
--- a/drivers/media/video/usbvideo/vicam.c
+++ b/drivers/staging/usbvideo/vicam.c