aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/media/Kconfig1
-rw-r--r--drivers/media/Makefile8
-rw-r--r--drivers/media/parport/Kconfig47
-rw-r--r--drivers/media/parport/Makefile4
-rw-r--r--drivers/media/parport/bw-qcam.c (renamed from drivers/media/video/bw-qcam.c)0
-rw-r--r--drivers/media/parport/c-qcam.c (renamed from drivers/media/video/c-qcam.c)0
-rw-r--r--drivers/media/parport/pms.c (renamed from drivers/media/video/pms.c)0
-rw-r--r--drivers/media/parport/w9966.c (renamed from drivers/media/video/w9966.c)0
-rw-r--r--drivers/media/video/Kconfig61
-rw-r--r--drivers/media/video/Makefile4
10 files changed, 56 insertions, 69 deletions
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 7970c24512e9..c6d8658e5334 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -164,6 +164,7 @@ source "drivers/media/dvb-core/Kconfig"
164source "drivers/media/pci/Kconfig" 164source "drivers/media/pci/Kconfig"
165source "drivers/media/usb/Kconfig" 165source "drivers/media/usb/Kconfig"
166source "drivers/media/mmc/Kconfig" 166source "drivers/media/mmc/Kconfig"
167source "drivers/media/parport/Kconfig"
167 168
168comment "Supported FireWire (IEEE 1394) Adapters" 169comment "Supported FireWire (IEEE 1394) Adapters"
169 depends on DVB_CORE && FIREWIRE 170 depends on DVB_CORE && FIREWIRE
diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index 3265a9a216df..360c44dec3e4 100644
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -8,8 +8,8 @@ ifeq ($(CONFIG_MEDIA_CONTROLLER),y)
8 obj-$(CONFIG_MEDIA_SUPPORT) += media.o 8 obj-$(CONFIG_MEDIA_SUPPORT) += media.o
9endif 9endif
10 10
11obj-y += v4l2-core/ tuners/ common/ rc/ video/ 11obj-y += tuners/ common/ rc/ video/
12obj-y += pci/ usb/ mmc/ firewire/ parport/
12 13
13obj-$(CONFIG_VIDEO_DEV) += radio/ 14obj-$(CONFIG_VIDEO_DEV) += radio/ v4l2-core/
14obj-$(CONFIG_DVB_CORE) += dvb-core/ pci/ dvb-frontends/ usb/ mmc/ 15obj-$(CONFIG_DVB_CORE) += dvb-core/ dvb-frontends/
15obj-$(CONFIG_DVB_FIREDTV) += firewire/
diff --git a/drivers/media/parport/Kconfig b/drivers/media/parport/Kconfig
new file mode 100644
index 000000000000..48138fe46e0e
--- /dev/null
+++ b/drivers/media/parport/Kconfig
@@ -0,0 +1,47 @@
1menu "V4L ISA and parallel port devices"
2 visible if (ISA || PARPORT) && MEDIA_CAMERA_SUPPORT
3
4config VIDEO_BWQCAM
5 tristate "Quickcam BW Video For Linux"
6 depends on PARPORT && VIDEO_V4L2
7 help
8 Say Y have if you the black and white version of the QuickCam
9 camera. See the next option for the color version.
10
11 To compile this driver as a module, choose M here: the
12 module will be called bw-qcam.
13
14config VIDEO_CQCAM
15 tristate "QuickCam Colour Video For Linux"
16 depends on PARPORT && VIDEO_V4L2
17 help
18 This is the video4linux driver for the colour version of the
19 Connectix QuickCam. If you have one of these cameras, say Y here,
20 otherwise say N. This driver does not work with the original
21 monochrome QuickCam, QuickCam VC or QuickClip. It is also available
22 as a module (c-qcam).
23 Read <file:Documentation/video4linux/CQcam.txt> for more information.
24
25config VIDEO_PMS
26 tristate "Mediavision Pro Movie Studio Video For Linux"
27 depends on ISA && VIDEO_V4L2
28 help
29 Say Y if you have the ISA Mediavision Pro Movie Studio
30 capture card.
31
32 To compile this driver as a module, choose M here: the
33 module will be called pms.
34
35config VIDEO_W9966
36 tristate "W9966CF Webcam (FlyCam Supra and others) Video For Linux"
37 depends on PARPORT_1284 && PARPORT && VIDEO_V4L2
38 help
39 Video4linux driver for Winbond's w9966 based Webcams.
40 Currently tested with the LifeView FlyCam Supra.
41 If you have one of these cameras, say Y here
42 otherwise say N.
43 This driver is also available as a module (w9966).
44
45 Check out <file:Documentation/video4linux/w9966.txt> for more
46 information.
47endmenu
diff --git a/drivers/media/parport/Makefile b/drivers/media/parport/Makefile
new file mode 100644
index 000000000000..4eea06d7af5b
--- /dev/null
+++ b/drivers/media/parport/Makefile
@@ -0,0 +1,4 @@
1obj-$(CONFIG_VIDEO_CQCAM) += c-qcam.o
2obj-$(CONFIG_VIDEO_BWQCAM) += bw-qcam.o
3obj-$(CONFIG_VIDEO_W9966) += w9966.o
4obj-$(CONFIG_VIDEO_PMS) += pms.o
diff --git a/drivers/media/video/bw-qcam.c b/drivers/media/parport/bw-qcam.c
index 5b75a64b199b..5b75a64b199b 100644
--- a/drivers/media/video/bw-qcam.c
+++ b/drivers/media/parport/bw-qcam.c
diff --git a/drivers/media/video/c-qcam.c b/drivers/media/parport/c-qcam.c
index ec51e1f12e82..ec51e1f12e82 100644
--- a/drivers/media/video/c-qcam.c
+++ b/drivers/media/parport/c-qcam.c
diff --git a/drivers/media/video/pms.c b/drivers/media/parport/pms.c
index 77f9c92186f4..77f9c92186f4 100644
--- a/drivers/media/video/pms.c
+++ b/drivers/media/parport/pms.c
diff --git a/drivers/media/video/w9966.c b/drivers/media/parport/w9966.c
index db2a6003a1c3..db2a6003a1c3 100644
--- a/drivers/media/video/w9966.c
+++ b/drivers/media/parport/w9966.c
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index d545d939c7d5..f9703a0a7d65 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -606,67 +606,6 @@ config VIDEO_VIVI
606 In doubt, say N. 606 In doubt, say N.
607 607
608# 608#
609# ISA & parallel port drivers configuration
610# All devices here are webcam or grabber devices
611#
612
613menuconfig V4L_ISA_PARPORT_DRIVERS
614 bool "V4L ISA and parallel port devices"
615 depends on ISA || PARPORT
616 depends on MEDIA_CAMERA_SUPPORT
617 default n
618 ---help---
619 Say Y here to enable support for these ISA and parallel port drivers.
620
621if V4L_ISA_PARPORT_DRIVERS
622
623config VIDEO_BWQCAM
624 tristate "Quickcam BW Video For Linux"
625 depends on PARPORT && VIDEO_V4L2
626 help
627 Say Y have if you the black and white version of the QuickCam
628 camera. See the next option for the color version.
629
630 To compile this driver as a module, choose M here: the
631 module will be called bw-qcam.
632
633config VIDEO_CQCAM
634 tristate "QuickCam Colour Video For Linux"
635 depends on PARPORT && VIDEO_V4L2
636 help
637 This is the video4linux driver for the colour version of the
638 Connectix QuickCam. If you have one of these cameras, say Y here,
639 otherwise say N. This driver does not work with the original
640 monochrome QuickCam, QuickCam VC or QuickClip. It is also available
641 as a module (c-qcam).
642 Read <file:Documentation/video4linux/CQcam.txt> for more information.
643
644config VIDEO_PMS
645 tristate "Mediavision Pro Movie Studio Video For Linux"
646 depends on ISA && VIDEO_V4L2
647 help
648 Say Y if you have the ISA Mediavision Pro Movie Studio
649 capture card.
650
651 To compile this driver as a module, choose M here: the
652 module will be called pms.
653
654config VIDEO_W9966
655 tristate "W9966CF Webcam (FlyCam Supra and others) Video For Linux"
656 depends on PARPORT_1284 && PARPORT && VIDEO_V4L2
657 help
658 Video4linux driver for Winbond's w9966 based Webcams.
659 Currently tested with the LifeView FlyCam Supra.
660 If you have one of these cameras, say Y here
661 otherwise say N.
662 This driver is also available as a module (w9966).
663
664 Check out <file:Documentation/video4linux/w9966.txt> for more
665 information.
666
667endif # V4L_ISA_PARPORT_DRIVERS
668
669#
670# Platform drivers 609# Platform drivers
671# All drivers here are currently for webcam support 610# All drivers here are currently for webcam support
672 611
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index f212af3ec740..a0c66923fcde 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -87,10 +87,6 @@ obj-$(CONFIG_SOC_CAMERA_TW9910) += tw9910.o
87 87
88# And now the v4l2 drivers: 88# And now the v4l2 drivers:
89 89
90obj-$(CONFIG_VIDEO_CQCAM) += c-qcam.o
91obj-$(CONFIG_VIDEO_BWQCAM) += bw-qcam.o
92obj-$(CONFIG_VIDEO_W9966) += w9966.o
93obj-$(CONFIG_VIDEO_PMS) += pms.o
94obj-$(CONFIG_VIDEO_VINO) += vino.o 90obj-$(CONFIG_VIDEO_VINO) += vino.o
95obj-$(CONFIG_VIDEO_TIMBERDALE) += timblogiw.o 91obj-$(CONFIG_VIDEO_TIMBERDALE) += timblogiw.o
96 92
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-28 09:16:14 -0500