From f32ee94990e8642f68653a94e715182924984516 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sat, 25 Dec 2010 07:27:47 -0300
Subject: [PATCH] --- yaml --- r: 226338 b: refs/heads/master c:
 745da4280f272840976d47afba22ed853f07e1b2 h: refs/heads/master v: v3

---
 [refs]                                                     | 2 +-
 trunk/drivers/media/video/Kconfig                          | 2 --
 trunk/drivers/media/video/Makefile                         | 4 ----
 trunk/drivers/staging/Kconfig                              | 2 ++
 trunk/drivers/staging/Makefile                             | 1 +
 trunk/drivers/{media/video => staging}/usbvideo/Kconfig    | 5 ++++-
 trunk/drivers/{media/video => staging}/usbvideo/Makefile   | 0
 trunk/drivers/{media/video => staging}/usbvideo/usbvideo.c | 0
 trunk/drivers/{media/video => staging}/usbvideo/usbvideo.h | 0
 trunk/drivers/{media/video => staging}/usbvideo/vicam.c    | 0
 10 files changed, 8 insertions(+), 8 deletions(-)
 rename trunk/drivers/{media/video => staging}/usbvideo/Kconfig (59%)
 rename trunk/drivers/{media/video => staging}/usbvideo/Makefile (100%)
 rename trunk/drivers/{media/video => staging}/usbvideo/usbvideo.c (100%)
 rename trunk/drivers/{media/video => staging}/usbvideo/usbvideo.h (100%)
 rename trunk/drivers/{media/video => staging}/usbvideo/vicam.c (100%)

diff --git a/[refs] b/[refs]
index 59a09a538c2f..3004fdca3ffb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5772dcaa790851ec068afcd0d1f160d801b1126e
+refs/heads/master: 745da4280f272840976d47afba22ed853f07e1b2
diff --git a/trunk/drivers/media/video/Kconfig b/trunk/drivers/media/video/Kconfig
index 4b751ef47a83..3655b30254d9 100644
--- a/trunk/drivers/media/video/Kconfig
+++ b/trunk/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/trunk/drivers/media/video/Makefile b/trunk/drivers/media/video/Makefile
index ace7b6eaf5b8..2f2e3ac877b4 100644
--- a/trunk/drivers/media/video/Makefile
+++ b/trunk/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/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig
index 5eafdf435550..a402a5614b86 100644
--- a/trunk/drivers/staging/Kconfig
+++ b/trunk/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/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile
index a97a955c094b..d4eb7146a87c 100644
--- a/trunk/drivers/staging/Makefile
+++ b/trunk/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/trunk/drivers/media/video/usbvideo/Kconfig b/trunk/drivers/staging/usbvideo/Kconfig
similarity index 59%
rename from trunk/drivers/media/video/usbvideo/Kconfig
rename to trunk/drivers/staging/usbvideo/Kconfig
index 357860d42a8b..aae863e8a902 100644
--- a/trunk/drivers/media/video/usbvideo/Kconfig
+++ b/trunk/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/trunk/drivers/media/video/usbvideo/Makefile b/trunk/drivers/staging/usbvideo/Makefile
similarity index 100%
rename from trunk/drivers/media/video/usbvideo/Makefile
rename to trunk/drivers/staging/usbvideo/Makefile
diff --git a/trunk/drivers/media/video/usbvideo/usbvideo.c b/trunk/drivers/staging/usbvideo/usbvideo.c
similarity index 100%
rename from trunk/drivers/media/video/usbvideo/usbvideo.c
rename to trunk/drivers/staging/usbvideo/usbvideo.c
diff --git a/trunk/drivers/media/video/usbvideo/usbvideo.h b/trunk/drivers/staging/usbvideo/usbvideo.h
similarity index 100%
rename from trunk/drivers/media/video/usbvideo/usbvideo.h
rename to trunk/drivers/staging/usbvideo/usbvideo.h
diff --git a/trunk/drivers/media/video/usbvideo/vicam.c b/trunk/drivers/staging/usbvideo/vicam.c
similarity index 100%
rename from trunk/drivers/media/video/usbvideo/vicam.c
rename to trunk/drivers/staging/usbvideo/vicam.c