diff options
| -rw-r--r-- | drivers/media/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/media/Makefile | 8 | ||||
| -rw-r--r-- | drivers/media/parport/Kconfig | 47 | ||||
| -rw-r--r-- | drivers/media/parport/Makefile | 4 | ||||
| -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/Kconfig | 61 | ||||
| -rw-r--r-- | drivers/media/video/Makefile | 4 |
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" source "drivers/media/pci/Kconfig" source "drivers/media/usb/Kconfig" source "drivers/media/mmc/Kconfig" +source "drivers/media/parport/Kconfig" comment "Supported FireWire (IEEE 1394) Adapters" 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) obj-$(CONFIG_MEDIA_SUPPORT) += media.o endif -obj-y += v4l2-core/ tuners/ common/ rc/ video/ +obj-y += tuners/ common/ rc/ video/ +obj-y += pci/ usb/ mmc/ firewire/ parport/ -obj-$(CONFIG_VIDEO_DEV) += radio/ -obj-$(CONFIG_DVB_CORE) += dvb-core/ pci/ dvb-frontends/ usb/ mmc/ -obj-$(CONFIG_DVB_FIREDTV) += firewire/ +obj-$(CONFIG_VIDEO_DEV) += radio/ v4l2-core/ +obj-$(CONFIG_DVB_CORE) += dvb-core/ dvb-frontends/ 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 @@ +menu "V4L ISA and parallel port devices" + visible if (ISA || PARPORT) && MEDIA_CAMERA_SUPPORT + +config VIDEO_BWQCAM + tristate "Quickcam BW Video For Linux" + depends on PARPORT && VIDEO_V4L2 + help + Say Y have if you the black and white version of the QuickCam + camera. See the next option for the color version. + + To compile this driver as a module, choose M here: the + module will be called bw-qcam. + +config VIDEO_CQCAM + tristate "QuickCam Colour Video For Linux" + depends on PARPORT && VIDEO_V4L2 + help + This is the video4linux driver for the colour version of the + Connectix QuickCam. If you have one of these cameras, say Y here, + otherwise say N. This driver does not work with the original + monochrome QuickCam, QuickCam VC or QuickClip. It is also available + as a module (c-qcam). + Read <file:Documentation/video4linux/CQcam.txt> for more information. + +config VIDEO_PMS + tristate "Mediavision Pro Movie Studio Video For Linux" + depends on ISA && VIDEO_V4L2 + help + Say Y if you have the ISA Mediavision Pro Movie Studio + capture card. + + To compile this driver as a module, choose M here: the + module will be called pms. + +config VIDEO_W9966 + tristate "W9966CF Webcam (FlyCam Supra and others) Video For Linux" + depends on PARPORT_1284 && PARPORT && VIDEO_V4L2 + help + Video4linux driver for Winbond's w9966 based Webcams. + Currently tested with the LifeView FlyCam Supra. + If you have one of these cameras, say Y here + otherwise say N. + This driver is also available as a module (w9966). + + Check out <file:Documentation/video4linux/w9966.txt> for more + information. +endmenu 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 @@ +obj-$(CONFIG_VIDEO_CQCAM) += c-qcam.o +obj-$(CONFIG_VIDEO_BWQCAM) += bw-qcam.o +obj-$(CONFIG_VIDEO_W9966) += w9966.o +obj-$(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 In doubt, say N. # -# ISA & parallel port drivers configuration -# All devices here are webcam or grabber devices -# - -menuconfig V4L_ISA_PARPORT_DRIVERS - bool "V4L ISA and parallel port devices" - depends on ISA || PARPORT - depends on MEDIA_CAMERA_SUPPORT - default n - ---help--- - Say Y here to enable support for these ISA and parallel port drivers. - -if V4L_ISA_PARPORT_DRIVERS - -config VIDEO_BWQCAM - tristate "Quickcam BW Video For Linux" - depends on PARPORT && VIDEO_V4L2 - help - Say Y have if you the black and white version of the QuickCam - camera. See the next option for the color version. - - To compile this driver as a module, choose M here: the - module will be called bw-qcam. - -config VIDEO_CQCAM - tristate "QuickCam Colour Video For Linux" - depends on PARPORT && VIDEO_V4L2 - help - This is the video4linux driver for the colour version of the - Connectix QuickCam. If you have one of these cameras, say Y here, - otherwise say N. This driver does not work with the original - monochrome QuickCam, QuickCam VC or QuickClip. It is also available - as a module (c-qcam). - Read <file:Documentation/video4linux/CQcam.txt> for more information. - -config VIDEO_PMS - tristate "Mediavision Pro Movie Studio Video For Linux" - depends on ISA && VIDEO_V4L2 - help - Say Y if you have the ISA Mediavision Pro Movie Studio - capture card. - - To compile this driver as a module, choose M here: the - module will be called pms. - -config VIDEO_W9966 - tristate "W9966CF Webcam (FlyCam Supra and others) Video For Linux" - depends on PARPORT_1284 && PARPORT && VIDEO_V4L2 - help - Video4linux driver for Winbond's w9966 based Webcams. - Currently tested with the LifeView FlyCam Supra. - If you have one of these cameras, say Y here - otherwise say N. - This driver is also available as a module (w9966). - - Check out <file:Documentation/video4linux/w9966.txt> for more - information. - -endif # V4L_ISA_PARPORT_DRIVERS - -# # Platform drivers # All drivers here are currently for webcam support 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 # And now the v4l2 drivers: -obj-$(CONFIG_VIDEO_CQCAM) += c-qcam.o -obj-$(CONFIG_VIDEO_BWQCAM) += bw-qcam.o -obj-$(CONFIG_VIDEO_W9966) += w9966.o -obj-$(CONFIG_VIDEO_PMS) += pms.o obj-$(CONFIG_VIDEO_VINO) += vino.o obj-$(CONFIG_VIDEO_TIMBERDALE) += timblogiw.o |