[media] move the remaining USB drivers to drivers/media/usb
Move the 3 remaining usb drivers to their proper space. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab
parent
0c0d06cac6
commit
0aa77f6c29
|
|
@ -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 <jdike@addtoit.com>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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/
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
obj-$(CONFIG_USB_S2255) += s2255drv.o
|
||||
|
||||
|
|
@ -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 <http://sourceforge.net/projects/syntekdriver/>
|
||||
|
||||
To compile this driver as a module, choose M here: the
|
||||
module will be called stkwebcam.
|
||||
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
stkwebcam-objs := stk-webcam.o stk-sensor.o
|
||||
|
||||
obj-$(CONFIG_USB_STKWEBCAM) += stkwebcam.o
|
||||
|
||||
|
|
@ -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 <file:Documentation/video4linux/zr364xx.txt> for more info
|
||||
and list of supported cameras.
|
||||
|
||||
To compile this driver as a module, choose M here: the
|
||||
module will be called zr364xx.
|
||||
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
obj-$(CONFIG_USB_ZR364XX) += zr364xx.o
|
||||
|
||||
|
|
@ -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 <file:Documentation/video4linux/zr364xx.txt> 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 <http://sourceforge.net/projects/syntekdriver/>
|
||||
|
||||
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
|
||||
#
|
||||
|
|
|
|||
|
|
@ -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/
|
||||
|
||||
|
|
|
|||
Reference in New Issue