---

yaml --- r: 226339 b: refs/heads/master c: 71bb287 h: refs/heads/master i: 226337: d922785 226335: adb85f9 v: v3
git-mirror · Dec 29, 2010 · b1bd329 · b1bd329
1 parent f32ee94
commit b1bd329
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 745da4280f272840976d47afba22ed853f07e1b2
+refs/heads/master: 71bb2876a3b2af8e6fd5ac20921ee0de9e07d809
diff --git a/trunk/drivers/media/video/Kconfig b/trunk/drivers/media/video/Kconfig
@@ -917,17 +917,6 @@ source "drivers/media/video/usbvision/Kconfig"
 
 source "drivers/media/video/et61x251/Kconfig"
 
-config USB_SE401
-	tristate "USB SE401 Camera support"
-	depends on VIDEO_V4L1
-	---help---
-	  Say Y here if you want to connect this type of camera to your
-	  computer's USB port. See <file:Documentation/video4linux/se401.txt>
-	  for more information and for a list of supported cameras.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called se401.
-
 source "drivers/media/video/sn9c102/Kconfig"
 
 source "drivers/media/video/pwc/Kconfig"

diff --git a/trunk/drivers/media/video/Makefile b/trunk/drivers/media/video/Makefile
@@ -122,7 +122,6 @@ obj-$(CONFIG_VIDEO_CAFE_CCIC) += cafe_ccic.o
 obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o
 
 obj-$(CONFIG_USB_DABUSB)        += dabusb.o
-obj-$(CONFIG_USB_SE401)         += se401.o
 obj-$(CONFIG_USB_ZR364XX)       += zr364xx.o
 obj-$(CONFIG_USB_STKWEBCAM)     += stkwebcam.o
 

diff --git 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/se401/Kconfig"
+
 source "drivers/staging/usbvideo/Kconfig"
 
 source "drivers/staging/usbip/Kconfig"

diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile
@@ -11,6 +11,7 @@ obj-$(CONFIG_VIDEO_TM6000)	+= tm6000/
 obj-$(CONFIG_VIDEO_CPIA)	+= cpia/
 obj-$(CONFIG_VIDEO_STRADIS)	+= stradis/
 obj-$(CONFIG_USB_VICAM)         += usbvideo/
+obj-$(CONFIG_USB_SE401)         += se401/
 obj-$(CONFIG_LIRC_STAGING)	+= lirc/
 obj-$(CONFIG_USB_IP_COMMON)	+= usbip/
 obj-$(CONFIG_W35UND)		+= winbond/

diff --git a/trunk/drivers/staging/se401/Kconfig b/trunk/drivers/staging/se401/Kconfig
@@ -0,0 +1,13 @@
+config USB_SE401
+	tristate "USB SE401 Camera support (DEPRECATED)"
+	depends on VIDEO_V4L1
+	---help---
+	  Say Y here if you want to connect this type of camera to your
+	  computer's USB port. See <file:Documentation/video4linux/se401.txt>
+	  for more information and for a list of supported cameras.
+
+	  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 se401.
diff --git a/trunk/drivers/staging/se401/Makefile b/trunk/drivers/staging/se401/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_USB_SE401)         += se401.o
diff --git a/trunk/drivers/media/video/se401.c → trunk/drivers/staging/se401/se401.c b/trunk/drivers/media/video/se401.c → trunk/drivers/staging/se401/se401.c
diff --git a/trunk/drivers/media/video/se401.h → trunk/drivers/staging/se401/se401.h b/trunk/drivers/media/video/se401.h → trunk/drivers/staging/se401/se401.h