leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] move parallel port/isa video drivers to drivers/media/parport/

Browse Source 
We should keep just the I2C drivers under drivers/media/video, and
then rename it to drivers/media/i2c.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab 2012-08-14 15:12:06 -03:00
parent e5cdf69d36
commit d1677dc31a
10 changed files with 56 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/media/Kconfig
View File

@ -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

8
drivers/media/Makefile
View File

@ -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/

47
drivers/media/parport/Kconfig Normal file
View File

@ -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

4
drivers/media/parport/Makefile Normal file
View File

@ -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

0
drivers/media/video/bw-qcam.c → drivers/media/parport/bw-qcam.c
View File

0
drivers/media/video/c-qcam.c → drivers/media/parport/c-qcam.c
View File

0
drivers/media/video/pms.c → drivers/media/parport/pms.c
View File

0
drivers/media/video/w9966.c → drivers/media/parport/w9966.c
View File

61
drivers/media/video/Kconfig
View File

@ -605,67 +605,6 @@ config VIDEO_VIVI
Say Y here if you want to test video apps or debug V4L devices.
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

4
drivers/media/video/Makefile
View File

@ -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