From 71bb2876a3b2af8e6fd5ac20921ee0de9e07d809 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Sat, 25 Dec 2010 07:36:55 -0300 Subject: [PATCH] [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 Signed-off-by: Mauro Carvalho Chehab --- drivers/media/video/Kconfig | 11 ----------- drivers/media/video/Makefile | 1 - drivers/staging/Kconfig | 2 ++ drivers/staging/Makefile | 1 + drivers/staging/se401/Kconfig | 13 +++++++++++++ drivers/staging/se401/Makefile | 1 + drivers/{media/video => staging/se401}/se401.c | 0 drivers/{media/video => staging/se401}/se401.h | 0 8 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 drivers/staging/se401/Kconfig create mode 100644 drivers/staging/se401/Makefile rename drivers/{media/video => staging/se401}/se401.c (100%) rename drivers/{media/video => staging/se401}/se401.h (100%) diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 3655b30254d..b3bf04368bf 100644 --- 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 - 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 2f2e3ac877b..fd684dd4f91 100644 --- 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 a402a5614b8..d9e3b6ddf68 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/se401/Kconfig" + source "drivers/staging/usbvideo/Kconfig" source "drivers/staging/usbip/Kconfig" diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index d4eb7146a87..8058a15b0cd 100644 --- 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 index 00000000000..586fc0432a4 --- /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 + 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 index 00000000000..b465d49783a --- /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 -- 2.41.0