aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MAINTAINERS2
-rw-r--r--drivers/media/usb/Kconfig3
-rw-r--r--drivers/media/usb/Makefile2
-rw-r--r--drivers/media/usb/s2255/Kconfig9
-rw-r--r--drivers/media/usb/s2255/Makefile2
-rw-r--r--drivers/media/usb/s2255/s2255drv.c (renamed from drivers/media/video/s2255drv.c)0
-rw-r--r--drivers/media/usb/stkwebcam/Kconfig13
-rw-r--r--drivers/media/usb/stkwebcam/Makefile4
-rw-r--r--drivers/media/usb/stkwebcam/stk-sensor.c (renamed from drivers/media/video/stk-sensor.c)0
-rw-r--r--drivers/media/usb/stkwebcam/stk-webcam.c (renamed from drivers/media/video/stk-webcam.c)0
-rw-r--r--drivers/media/usb/stkwebcam/stk-webcam.h (renamed from drivers/media/video/stk-webcam.h)0
-rw-r--r--drivers/media/usb/zr364xx/Kconfig14
-rw-r--r--drivers/media/usb/zr364xx/Makefile2
-rw-r--r--drivers/media/usb/zr364xx/zr364xx.c (renamed from drivers/media/video/zr364xx.c)0
-rw-r--r--drivers/media/video/Kconfig50
-rw-r--r--drivers/media/video/Makefile8
16 files changed, 50 insertions, 59 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 13fd97f6466a..99a930d712cf 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7371,7 +7371,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
7371W: http://royale.zerezo.com/zr364xx/ 7371W: http://royale.zerezo.com/zr364xx/
7372S: Maintained 7372S: Maintained
7373F: Documentation/video4linux/zr364xx.txt 7373F: Documentation/video4linux/zr364xx.txt
7374F: drivers/media/video/zr364xx.c 7374F: drivers/media/usb/zr364xx.c
7375 7375
7376USER-MODE LINUX (UML) 7376USER-MODE LINUX (UML)
7377M: Jeff Dike <jdike@addtoit.com> 7377M: Jeff Dike <jdike@addtoit.com>
diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig
index a1e25ee9d671..069a3c1d03f5 100644
--- a/drivers/media/usb/Kconfig
+++ b/drivers/media/usb/Kconfig
@@ -11,6 +11,9 @@ source "drivers/media/usb/uvc/Kconfig"
11source "drivers/media/usb/gspca/Kconfig" 11source "drivers/media/usb/gspca/Kconfig"
12source "drivers/media/usb/pwc/Kconfig" 12source "drivers/media/usb/pwc/Kconfig"
13source "drivers/media/usb/cpia2/Kconfig" 13source "drivers/media/usb/cpia2/Kconfig"
14source "drivers/media/usb/zr364xx/Kconfig"
15source "drivers/media/usb/stkwebcam/Kconfig"
16source "drivers/media/usb/s2255/Kconfig"
14source "drivers/media/usb/sn9c102/Kconfig" 17source "drivers/media/usb/sn9c102/Kconfig"
15endif 18endif
16 19
diff --git a/drivers/media/usb/Makefile b/drivers/media/usb/Makefile
index 428827a4d97a..63e37bb2ed74 100644
--- a/drivers/media/usb/Makefile
+++ b/drivers/media/usb/Makefile
@@ -4,6 +4,8 @@
4 4
5# DVB USB-only drivers 5# DVB USB-only drivers
6obj-y := ttusb-dec/ ttusb-budget/ dvb-usb/ dvb-usb-v2/ siano/ b2c2/ 6obj-y := ttusb-dec/ ttusb-budget/ dvb-usb/ dvb-usb-v2/ siano/ b2c2/
7obj-y := zr364xx/ stkwebcam/ s2255/
8
7obj-$(CONFIG_USB_VIDEO_CLASS) += uvc/ 9obj-$(CONFIG_USB_VIDEO_CLASS) += uvc/
8obj-$(CONFIG_USB_GSPCA) += gspca/ 10obj-$(CONFIG_USB_GSPCA) += gspca/
9obj-$(CONFIG_USB_PWC) += pwc/ 11obj-$(CONFIG_USB_PWC) += pwc/
diff --git a/drivers/media/usb/s2255/Kconfig b/drivers/media/usb/s2255/Kconfig
new file mode 100644
index 000000000000..7e8ee1f864ab
--- /dev/null
+++ b/drivers/media/usb/s2255/Kconfig
@@ -0,0 +1,9 @@
1config USB_S2255
2 tristate "USB Sensoray 2255 video capture device"
3 depends on VIDEO_V4L2
4 select VIDEOBUF_VMALLOC
5 default n
6 help
7 Say Y here if you want support for the Sensoray 2255 USB device.
8 This driver can be compiled as a module, called s2255drv.
9
diff --git a/drivers/media/usb/s2255/Makefile b/drivers/media/usb/s2255/Makefile
new file mode 100644
index 000000000000..197d0bb2adfd
--- /dev/null
+++ b/drivers/media/usb/s2255/Makefile
@@ -0,0 +1,2 @@
1obj-$(CONFIG_USB_S2255) += s2255drv.o
2
diff --git a/drivers/media/video/s2255drv.c b/drivers/media/usb/s2255/s2255drv.c
index 6c7960cc7506..6c7960cc7506 100644
--- a/drivers/media/video/s2255drv.c
+++ b/drivers/media/usb/s2255/s2255drv.c
diff --git a/drivers/media/usb/stkwebcam/Kconfig b/drivers/media/usb/stkwebcam/Kconfig
new file mode 100644
index 000000000000..2fb0c2b687f4
--- /dev/null
+++ b/drivers/media/usb/stkwebcam/Kconfig
@@ -0,0 +1,13 @@
1config USB_STKWEBCAM
2 tristate "USB Syntek DC1125 Camera support"
3 depends on VIDEO_V4L2 && EXPERIMENTAL
4 ---help---
5 Say Y here if you want to use this type of camera.
6 Supported devices are typically found in some Asus laptops,
7 with USB id 174f:a311 and 05e1:0501. Other Syntek cameras
8 may be supported by the stk11xx driver, from which this is
9 derived, see <http://sourceforge.net/projects/syntekdriver/>
10
11 To compile this driver as a module, choose M here: the
12 module will be called stkwebcam.
13
diff --git a/drivers/media/usb/stkwebcam/Makefile b/drivers/media/usb/stkwebcam/Makefile
new file mode 100644
index 000000000000..20ef8a4b990c
--- /dev/null
+++ b/drivers/media/usb/stkwebcam/Makefile
@@ -0,0 +1,4 @@
1stkwebcam-objs := stk-webcam.o stk-sensor.o
2
3obj-$(CONFIG_USB_STKWEBCAM) += stkwebcam.o
4
diff --git a/drivers/media/video/stk-sensor.c b/drivers/media/usb/stkwebcam/stk-sensor.c
index e546b014d7ad..e546b014d7ad 100644
--- a/drivers/media/video/stk-sensor.c
+++ b/drivers/media/usb/stkwebcam/stk-sensor.c
diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/usb/stkwebcam/stk-webcam.c
index 86a0fc56c330..86a0fc56c330 100644
--- a/drivers/media/video/stk-webcam.c
+++ b/drivers/media/usb/stkwebcam/stk-webcam.c
diff --git a/drivers/media/video/stk-webcam.h b/drivers/media/usb/stkwebcam/stk-webcam.h
index 9f6736637571..9f6736637571 100644
--- a/drivers/media/video/stk-webcam.h
+++ b/drivers/media/usb/stkwebcam/stk-webcam.h
diff --git a/drivers/media/usb/zr364xx/Kconfig b/drivers/media/usb/zr364xx/Kconfig
new file mode 100644
index 000000000000..0f585662881d
--- /dev/null
+++ b/drivers/media/usb/zr364xx/Kconfig
@@ -0,0 +1,14 @@
1config USB_ZR364XX
2 tristate "USB ZR364XX Camera support"
3 depends on VIDEO_V4L2
4 select VIDEOBUF_GEN
5 select VIDEOBUF_VMALLOC
6 ---help---
7 Say Y here if you want to connect this type of camera to your
8 computer's USB port.
9 See <file:Documentation/video4linux/zr364xx.txt> for more info
10 and list of supported cameras.
11
12 To compile this driver as a module, choose M here: the
13 module will be called zr364xx.
14
diff --git a/drivers/media/usb/zr364xx/Makefile b/drivers/media/usb/zr364xx/Makefile
new file mode 100644
index 000000000000..a5777883a1f8
--- /dev/null
+++ b/drivers/media/usb/zr364xx/Makefile
@@ -0,0 +1,2 @@
1obj-$(CONFIG_USB_ZR364XX) += zr364xx.o
2
diff --git a/drivers/media/video/zr364xx.c b/drivers/media/usb/zr364xx/zr364xx.c
index 9afab35878b4..9afab35878b4 100644
--- a/drivers/media/video/zr364xx.c
+++ b/drivers/media/usb/zr364xx/zr364xx.c
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 097b17ced172..f52799232029 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -606,56 +606,6 @@ config VIDEO_VIVI
606 In doubt, say N. 606 In doubt, say N.
607 607
608# 608#
609# USB Multimedia device configuration
610#
611
612menuconfig V4L_USB_DRIVERS
613 bool "V4L USB devices"
614 depends on USB
615 default y
616
617if V4L_USB_DRIVERS && MEDIA_CAMERA_SUPPORT
618
619config USB_ZR364XX
620 tristate "USB ZR364XX Camera support"
621 depends on VIDEO_V4L2
622 select VIDEOBUF_GEN
623 select VIDEOBUF_VMALLOC
624 ---help---
625 Say Y here if you want to connect this type of camera to your
626 computer's USB port.
627 See <file:Documentation/video4linux/zr364xx.txt> for more info
628 and list of supported cameras.
629
630 To compile this driver as a module, choose M here: the
631 module will be called zr364xx.
632
633config USB_STKWEBCAM
634 tristate "USB Syntek DC1125 Camera support"
635 depends on VIDEO_V4L2 && EXPERIMENTAL
636 ---help---
637 Say Y here if you want to use this type of camera.
638 Supported devices are typically found in some Asus laptops,
639 with USB id 174f:a311 and 05e1:0501. Other Syntek cameras
640 may be supported by the stk11xx driver, from which this is
641 derived, see <http://sourceforge.net/projects/syntekdriver/>
642
643 To compile this driver as a module, choose M here: the
644 module will be called stkwebcam.
645
646config USB_S2255
647 tristate "USB Sensoray 2255 video capture device"
648 depends on VIDEO_V4L2
649 select VIDEOBUF_VMALLOC
650 default n
651 help
652 Say Y here if you want support for the Sensoray 2255 USB device.
653 This driver can be compiled as a module, called s2255drv.
654
655
656endif # V4L_USB_DRIVERS && MEDIA_CAMERA_SUPPORT
657
658#
659# PCI drivers configuration - No devices here are for webcams 609# PCI drivers configuration - No devices here are for webcams
660# 610#
661 611
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index a22a2580ce30..4ad5bd9246bf 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -4,8 +4,6 @@
4 4
5msp3400-objs := msp3400-driver.o msp3400-kthreads.o 5msp3400-objs := msp3400-driver.o msp3400-kthreads.o
6 6
7stkwebcam-objs := stk-webcam.o stk-sensor.o
8
9omap2cam-objs := omap24xxcam.o omap24xxcam-dma.o 7omap2cam-objs := omap24xxcam.o omap24xxcam-dma.o
10 8
11# Helper modules 9# Helper modules
@@ -119,12 +117,6 @@ obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o
119 117
120obj-$(CONFIG_VIDEO_OMAP3) += omap3isp/ 118obj-$(CONFIG_VIDEO_OMAP3) += omap3isp/
121 119
122obj-$(CONFIG_USB_ZR364XX) += zr364xx.o
123obj-$(CONFIG_USB_STKWEBCAM) += stkwebcam.o
124
125
126obj-$(CONFIG_USB_S2255) += s2255drv.o
127
128obj-$(CONFIG_VIDEO_IVTV) += ivtv/ 120obj-$(CONFIG_VIDEO_IVTV) += ivtv/
129obj-$(CONFIG_VIDEO_CX18) += cx18/ 121obj-$(CONFIG_VIDEO_CX18) += cx18/
130 122
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-14 15:42:01 -0500