From 2213e9728161c258d1b8af71f7f95562f25d1264 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 14 Aug 2012 01:01:29 -0300 Subject: [PATCH] --- yaml --- r: 330851 b: refs/heads/master c: 0aa77f6c2954896b132f8b6f2e9f063c52800913 h: refs/heads/master i: 330849: 8ceeea0dad6eb62574edeae3a6b41f65397d20e8 330847: fd29f650192b7946db7c28cd99237669d11cde06 v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 2 +- trunk/drivers/media/usb/Kconfig | 3 ++ trunk/drivers/media/usb/Makefile | 2 + trunk/drivers/media/usb/s2255/Kconfig | 9 ++++ trunk/drivers/media/usb/s2255/Makefile | 2 + .../media/{video => usb/s2255}/s2255drv.c | 0 trunk/drivers/media/usb/stkwebcam/Kconfig | 13 +++++ trunk/drivers/media/usb/stkwebcam/Makefile | 4 ++ .../{video => usb/stkwebcam}/stk-sensor.c | 0 .../{video => usb/stkwebcam}/stk-webcam.c | 0 .../{video => usb/stkwebcam}/stk-webcam.h | 0 trunk/drivers/media/usb/zr364xx/Kconfig | 14 ++++++ trunk/drivers/media/usb/zr364xx/Makefile | 2 + .../media/{video => usb/zr364xx}/zr364xx.c | 0 trunk/drivers/media/video/Kconfig | 50 ------------------- trunk/drivers/media/video/Makefile | 8 --- 17 files changed, 51 insertions(+), 60 deletions(-) create mode 100644 trunk/drivers/media/usb/s2255/Kconfig create mode 100644 trunk/drivers/media/usb/s2255/Makefile rename trunk/drivers/media/{video => usb/s2255}/s2255drv.c (100%) create mode 100644 trunk/drivers/media/usb/stkwebcam/Kconfig create mode 100644 trunk/drivers/media/usb/stkwebcam/Makefile rename trunk/drivers/media/{video => usb/stkwebcam}/stk-sensor.c (100%) rename trunk/drivers/media/{video => usb/stkwebcam}/stk-webcam.c (100%) rename trunk/drivers/media/{video => usb/stkwebcam}/stk-webcam.h (100%) create mode 100644 trunk/drivers/media/usb/zr364xx/Kconfig create mode 100644 trunk/drivers/media/usb/zr364xx/Makefile rename trunk/drivers/media/{video => usb/zr364xx}/zr364xx.c (100%) diff --git a/[refs] b/[refs] index 378824d0bbd7..a20868411e3a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0c0d06cac63ee327ceaab4b5ffe2206574ab86bd +refs/heads/master: 0aa77f6c2954896b132f8b6f2e9f063c52800913 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 13fd97f6466a..99a930d712cf 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -7371,7 +7371,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git W: http://royale.zerezo.com/zr364xx/ S: Maintained F: Documentation/video4linux/zr364xx.txt -F: drivers/media/video/zr364xx.c +F: drivers/media/usb/zr364xx.c USER-MODE LINUX (UML) M: Jeff Dike diff --git a/trunk/drivers/media/usb/Kconfig b/trunk/drivers/media/usb/Kconfig index a1e25ee9d671..069a3c1d03f5 100644 --- a/trunk/drivers/media/usb/Kconfig +++ b/trunk/drivers/media/usb/Kconfig @@ -11,6 +11,9 @@ source "drivers/media/usb/uvc/Kconfig" source "drivers/media/usb/gspca/Kconfig" source "drivers/media/usb/pwc/Kconfig" source "drivers/media/usb/cpia2/Kconfig" +source "drivers/media/usb/zr364xx/Kconfig" +source "drivers/media/usb/stkwebcam/Kconfig" +source "drivers/media/usb/s2255/Kconfig" source "drivers/media/usb/sn9c102/Kconfig" endif diff --git a/trunk/drivers/media/usb/Makefile b/trunk/drivers/media/usb/Makefile index 428827a4d97a..63e37bb2ed74 100644 --- a/trunk/drivers/media/usb/Makefile +++ b/trunk/drivers/media/usb/Makefile @@ -4,6 +4,8 @@ # DVB USB-only drivers obj-y := ttusb-dec/ ttusb-budget/ dvb-usb/ dvb-usb-v2/ siano/ b2c2/ +obj-y := zr364xx/ stkwebcam/ s2255/ + obj-$(CONFIG_USB_VIDEO_CLASS) += uvc/ obj-$(CONFIG_USB_GSPCA) += gspca/ obj-$(CONFIG_USB_PWC) += pwc/ diff --git a/trunk/drivers/media/usb/s2255/Kconfig b/trunk/drivers/media/usb/s2255/Kconfig new file mode 100644 index 000000000000..7e8ee1f864ab --- /dev/null +++ b/trunk/drivers/media/usb/s2255/Kconfig @@ -0,0 +1,9 @@ +config USB_S2255 + tristate "USB Sensoray 2255 video capture device" + depends on VIDEO_V4L2 + select VIDEOBUF_VMALLOC + default n + help + Say Y here if you want support for the Sensoray 2255 USB device. + This driver can be compiled as a module, called s2255drv. + diff --git a/trunk/drivers/media/usb/s2255/Makefile b/trunk/drivers/media/usb/s2255/Makefile new file mode 100644 index 000000000000..197d0bb2adfd --- /dev/null +++ b/trunk/drivers/media/usb/s2255/Makefile @@ -0,0 +1,2 @@ +obj-$(CONFIG_USB_S2255) += s2255drv.o + diff --git a/trunk/drivers/media/video/s2255drv.c b/trunk/drivers/media/usb/s2255/s2255drv.c similarity index 100% rename from trunk/drivers/media/video/s2255drv.c rename to trunk/drivers/media/usb/s2255/s2255drv.c diff --git a/trunk/drivers/media/usb/stkwebcam/Kconfig b/trunk/drivers/media/usb/stkwebcam/Kconfig new file mode 100644 index 000000000000..2fb0c2b687f4 --- /dev/null +++ b/trunk/drivers/media/usb/stkwebcam/Kconfig @@ -0,0 +1,13 @@ +config USB_STKWEBCAM + tristate "USB Syntek DC1125 Camera support" + depends on VIDEO_V4L2 && EXPERIMENTAL + ---help--- + Say Y here if you want to use this type of camera. + Supported devices are typically found in some Asus laptops, + with USB id 174f:a311 and 05e1:0501. Other Syntek cameras + may be supported by the stk11xx driver, from which this is + derived, see + + To compile this driver as a module, choose M here: the + module will be called stkwebcam. + diff --git a/trunk/drivers/media/usb/stkwebcam/Makefile b/trunk/drivers/media/usb/stkwebcam/Makefile new file mode 100644 index 000000000000..20ef8a4b990c --- /dev/null +++ b/trunk/drivers/media/usb/stkwebcam/Makefile @@ -0,0 +1,4 @@ +stkwebcam-objs := stk-webcam.o stk-sensor.o + +obj-$(CONFIG_USB_STKWEBCAM) += stkwebcam.o + diff --git a/trunk/drivers/media/video/stk-sensor.c b/trunk/drivers/media/usb/stkwebcam/stk-sensor.c similarity index 100% rename from trunk/drivers/media/video/stk-sensor.c rename to trunk/drivers/media/usb/stkwebcam/stk-sensor.c diff --git a/trunk/drivers/media/video/stk-webcam.c b/trunk/drivers/media/usb/stkwebcam/stk-webcam.c similarity index 100% rename from trunk/drivers/media/video/stk-webcam.c rename to trunk/drivers/media/usb/stkwebcam/stk-webcam.c diff --git a/trunk/drivers/media/video/stk-webcam.h b/trunk/drivers/media/usb/stkwebcam/stk-webcam.h similarity index 100% rename from trunk/drivers/media/video/stk-webcam.h rename to trunk/drivers/media/usb/stkwebcam/stk-webcam.h diff --git a/trunk/drivers/media/usb/zr364xx/Kconfig b/trunk/drivers/media/usb/zr364xx/Kconfig new file mode 100644 index 000000000000..0f585662881d --- /dev/null +++ b/trunk/drivers/media/usb/zr364xx/Kconfig @@ -0,0 +1,14 @@ +config USB_ZR364XX + tristate "USB ZR364XX Camera support" + depends on VIDEO_V4L2 + select VIDEOBUF_GEN + select VIDEOBUF_VMALLOC + ---help--- + Say Y here if you want to connect this type of camera to your + computer's USB port. + See for more info + and list of supported cameras. + + To compile this driver as a module, choose M here: the + module will be called zr364xx. + diff --git a/trunk/drivers/media/usb/zr364xx/Makefile b/trunk/drivers/media/usb/zr364xx/Makefile new file mode 100644 index 000000000000..a5777883a1f8 --- /dev/null +++ b/trunk/drivers/media/usb/zr364xx/Makefile @@ -0,0 +1,2 @@ +obj-$(CONFIG_USB_ZR364XX) += zr364xx.o + diff --git a/trunk/drivers/media/video/zr364xx.c b/trunk/drivers/media/usb/zr364xx/zr364xx.c similarity index 100% rename from trunk/drivers/media/video/zr364xx.c rename to trunk/drivers/media/usb/zr364xx/zr364xx.c diff --git a/trunk/drivers/media/video/Kconfig b/trunk/drivers/media/video/Kconfig index 097b17ced172..f52799232029 100644 --- a/trunk/drivers/media/video/Kconfig +++ b/trunk/drivers/media/video/Kconfig @@ -605,56 +605,6 @@ config VIDEO_VIVI Say Y here if you want to test video apps or debug V4L devices. In doubt, say N. -# -# USB Multimedia device configuration -# - -menuconfig V4L_USB_DRIVERS - bool "V4L USB devices" - depends on USB - default y - -if V4L_USB_DRIVERS && MEDIA_CAMERA_SUPPORT - -config USB_ZR364XX - tristate "USB ZR364XX Camera support" - depends on VIDEO_V4L2 - select VIDEOBUF_GEN - select VIDEOBUF_VMALLOC - ---help--- - Say Y here if you want to connect this type of camera to your - computer's USB port. - See for more info - and list of supported cameras. - - To compile this driver as a module, choose M here: the - module will be called zr364xx. - -config USB_STKWEBCAM - tristate "USB Syntek DC1125 Camera support" - depends on VIDEO_V4L2 && EXPERIMENTAL - ---help--- - Say Y here if you want to use this type of camera. - Supported devices are typically found in some Asus laptops, - with USB id 174f:a311 and 05e1:0501. Other Syntek cameras - may be supported by the stk11xx driver, from which this is - derived, see - - To compile this driver as a module, choose M here: the - module will be called stkwebcam. - -config USB_S2255 - tristate "USB Sensoray 2255 video capture device" - depends on VIDEO_V4L2 - select VIDEOBUF_VMALLOC - default n - help - Say Y here if you want support for the Sensoray 2255 USB device. - This driver can be compiled as a module, called s2255drv. - - -endif # V4L_USB_DRIVERS && MEDIA_CAMERA_SUPPORT - # # PCI drivers configuration - No devices here are for webcams # diff --git a/trunk/drivers/media/video/Makefile b/trunk/drivers/media/video/Makefile index a22a2580ce30..4ad5bd9246bf 100644 --- a/trunk/drivers/media/video/Makefile +++ b/trunk/drivers/media/video/Makefile @@ -4,8 +4,6 @@ msp3400-objs := msp3400-driver.o msp3400-kthreads.o -stkwebcam-objs := stk-webcam.o stk-sensor.o - omap2cam-objs := omap24xxcam.o omap24xxcam-dma.o # Helper modules @@ -119,12 +117,6 @@ obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o obj-$(CONFIG_VIDEO_OMAP3) += omap3isp/ -obj-$(CONFIG_USB_ZR364XX) += zr364xx.o -obj-$(CONFIG_USB_STKWEBCAM) += stkwebcam.o - - -obj-$(CONFIG_USB_S2255) += s2255drv.o - obj-$(CONFIG_VIDEO_IVTV) += ivtv/ obj-$(CONFIG_VIDEO_CX18) += cx18/