[media] se401: deprecate driver, move to staging

The se401 driver is deprecated and is moved to staging. If no one will
convert this driver to V4L2, then it will be removed in 2.6.39.

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 3655b30254d9504f41fb4c96e32d51764c8550dd..b3bf04368bf293098df431472148b57d51ccbf31 100644 (file)
--- a/drivers/media/video/Kconfig
+++ b/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/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 2f2e3ac877b4686c1bf0e7293f2b96f507d6c383..fd684dd4f91cd8a8b000fced61db551641dc7c84 100644 (file)
--- a/drivers/media/video/Makefile
+++ b/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/drivers/staging/Kconfig b/drivers/staging/Kconfig
index a402a5614b869b0e83cabb9164d314d9ec693601..d9e3b6ddf682f201173e0e6ee399778310a9cac2 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/se401/Kconfig"
+
 source "drivers/staging/usbvideo/Kconfig"
 
 source "drivers/staging/usbip/Kconfig"

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index d4eb7146a87c4fd2999a0d4b43a6c58cedb4328c..8058a15b0cd70f3607d5097c381e36c4452e43ff 100644 (file)
--- a/drivers/staging/Makefile
+++ b/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/drivers/staging/se401/Kconfig b/drivers/staging/se401/Kconfig
new file mode 100644 (file)
index 0000000..586fc04
--- /dev/null
+++ b/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/drivers/staging/se401/Makefile b/drivers/staging/se401/Makefile
new file mode 100644 (file)
index 0000000..b465d49
--- /dev/null
+++ b/drivers/staging/se401/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_USB_SE401)         += se401.o

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

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