Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-04 18:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

[media] move the remaining PCI devices to drivers/media/pci

Browse Source 
Move meye and sta2x11_vip into the drivers/media/pci subdirs.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab 2012-08-14 14:50:53 -03:00
parent 3e7c99126f
commit e5cdf69d36
12 changed files with 35 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/pci/Kconfig
View File

@ -5,6 +5,12 @@
menu "Media PCI Adapters"
visible if PCI && MEDIA_SUPPORT
if MEDIA_CAMERA_SUPPORT
comment "Media capture support"
source "drivers/media/pci/meye/Kconfig"
source "drivers/media/pci/sta2x11/Kconfig"
endif
if MEDIA_ANALOG_TV_SUPPORT
comment "Media capture/analog TV support"
source "drivers/media/pci/ivtv/Kconfig"

2
drivers/media/pci/Makefile
View File

@ -22,3 +22,5 @@ obj-$(CONFIG_VIDEO_CX88) += cx88/
obj-$(CONFIG_VIDEO_BT848) += bt8xx/
obj-$(CONFIG_VIDEO_SAA7134) += saa7134/
obj-$(CONFIG_VIDEO_SAA7164) += saa7164/
obj-$(CONFIG_VIDEO_MEYE) += meye/
obj-$(CONFIG_STA2X11_VIP) += sta2x11/

13
drivers/media/pci/meye/Kconfig Normal file
View File

@ -0,0 +1,13 @@
config VIDEO_MEYE
tristate "Sony Vaio Picturebook Motion Eye Video For Linux"
depends on PCI && SONY_LAPTOP && VIDEO_V4L2
---help---
This is the video4linux driver for the Motion Eye camera found
in the Vaio Picturebook laptops. Please read the material in
<file:Documentation/video4linux/meye.txt> for more information.
If you say Y or M here, you need to say Y or M to "Sony Laptop
Extras" in the misc device section.
To compile this driver as a module, choose M here: the
module will be called meye.

1
drivers/media/pci/meye/Makefile Normal file
View File

@ -0,0 +1 @@
obj-$(CONFIG_VIDEO_MEYE) += meye.o

0
drivers/media/video/meye.c → drivers/media/pci/meye/meye.c
View File

0
drivers/media/video/meye.h → drivers/media/pci/meye/meye.h
View File

12
drivers/media/pci/sta2x11/Kconfig Normal file
View File

@ -0,0 +1,12 @@
config STA2X11_VIP
tristate "STA2X11 VIP Video For Linux"
depends on STA2X11
select VIDEO_ADV7180 if VIDEO_HELPER_CHIPS_AUTO
select VIDEOBUF_DMA_CONTIG
depends on PCI && VIDEO_V4L2 && VIRT_TO_BUS
help
Say Y for support for STA2X11 VIP (Video Input Port) capture
device.
To compile this driver as a module, choose M here: the
module will be called sta2x11_vip.

1
drivers/media/pci/sta2x11/Makefile Normal file
View File

@ -0,0 +1 @@
obj-$(CONFIG_STA2X11_VIP) += sta2x11_vip.o

0
drivers/media/video/sta2x11_vip.c → drivers/media/pci/sta2x11/sta2x11_vip.c
View File

0
drivers/media/video/sta2x11_vip.h → drivers/media/pci/sta2x11/sta2x11_vip.h
View File

45
drivers/media/video/Kconfig
View File

@ -605,51 +605,6 @@ config VIDEO_VIVI
Say Y here if you want to test video apps or debug V4L devices.
In doubt, say N.
#
# PCI drivers configuration - No devices here are for webcams
#
menuconfig V4L_PCI_DRIVERS
bool "V4L PCI(e) devices"
depends on PCI
depends on MEDIA_ANALOG_TV_SUPPORT
default y
---help---
Say Y here to enable support for these PCI(e) drivers.
if V4L_PCI_DRIVERS
config VIDEO_MEYE
tristate "Sony Vaio Picturebook Motion Eye Video For Linux"
depends on PCI && SONY_LAPTOP && VIDEO_V4L2
---help---
This is the video4linux driver for the Motion Eye camera found
in the Vaio Picturebook laptops. Please read the material in
<file:Documentation/video4linux/meye.txt> for more information.
If you say Y or M here, you need to say Y or M to "Sony Laptop
Extras" in the misc device section.
To compile this driver as a module, choose M here: the
module will be called meye.
config STA2X11_VIP
tristate "STA2X11 VIP Video For Linux"
depends on STA2X11
select VIDEO_ADV7180 if VIDEO_HELPER_CHIPS_AUTO
select VIDEOBUF_DMA_CONTIG
depends on PCI && VIDEO_V4L2 && VIRT_TO_BUS
help
Say Y for support for STA2X11 VIP (Video Input Port) capture
device.
To compile this driver as a module, choose M here: the
module will be called sta2x11_vip.
endif # V4L_PCI_DRIVERS
#
# ISA & parallel port drivers configuration
# All devices here are webcam or grabber devices

2
drivers/media/video/Makefile
View File

@ -92,8 +92,6 @@ 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_MEYE) += meye.o
obj-$(CONFIG_STA2X11_VIP) += sta2x11_vip.o
obj-$(CONFIG_VIDEO_TIMBERDALE) += timblogiw.o
obj-$(CONFIG_VIDEO_BTCX) += btcx-risc.o