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

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

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/pci/Kconfig b/drivers/media/pci/Kconfig
index e1a9e1afd72c7953324e61af92a430acbcbca75d..4243d5d38c0a09da817b33b148931a8077943fa9 100644 (file)
--- a/drivers/media/pci/Kconfig
+++ b/drivers/media/pci/Kconfig
@@ -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"

diff --git a/drivers/media/pci/Makefile b/drivers/media/pci/Makefile
index bb71e30b9d25652cb28fce00900130f121602e5b..c8dc6c7753034d678048ae18589aac90f6286ffd 100644 (file)
--- a/drivers/media/pci/Makefile
+++ b/drivers/media/pci/Makefile
@@ -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/

diff --git a/drivers/media/pci/meye/Kconfig b/drivers/media/pci/meye/Kconfig
new file mode 100644 (file)
index 0000000..b4bf848
--- /dev/null
+++ b/drivers/media/pci/meye/Kconfig
@@ -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.

diff --git a/drivers/media/pci/meye/Makefile b/drivers/media/pci/meye/Makefile
new file mode 100644 (file)
index 0000000..4938851
--- /dev/null
+++ b/drivers/media/pci/meye/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_VIDEO_MEYE) += meye.o

diff --git a/drivers/media/video/meye.c b/drivers/media/pci/meye/meye.c
similarity index 100%
rename from drivers/media/video/meye.c
rename to drivers/media/pci/meye/meye.c

diff --git a/drivers/media/video/meye.h b/drivers/media/pci/meye/meye.h
similarity index 100%
rename from drivers/media/video/meye.h
rename to drivers/media/pci/meye/meye.h

diff --git a/drivers/media/pci/sta2x11/Kconfig b/drivers/media/pci/sta2x11/Kconfig
new file mode 100644 (file)
index 0000000..04a82cb
--- /dev/null
+++ b/drivers/media/pci/sta2x11/Kconfig
@@ -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.

diff --git a/drivers/media/pci/sta2x11/Makefile b/drivers/media/pci/sta2x11/Makefile
new file mode 100644 (file)
index 0000000..d6c471d
--- /dev/null
+++ b/drivers/media/pci/sta2x11/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_STA2X11_VIP) += sta2x11_vip.o

diff --git a/drivers/media/video/sta2x11_vip.c b/drivers/media/pci/sta2x11/sta2x11_vip.c
similarity index 100%
rename from drivers/media/video/sta2x11_vip.c
rename to drivers/media/pci/sta2x11/sta2x11_vip.c

diff --git a/drivers/media/video/sta2x11_vip.h b/drivers/media/pci/sta2x11/sta2x11_vip.h
similarity index 100%
rename from drivers/media/video/sta2x11_vip.h
rename to drivers/media/pci/sta2x11/sta2x11_vip.h

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 4d79dfd452b8763fc92f5d7c70b1afb187797c2d..d545d939c7d53ebfec5620d214ebfc49769cbd2a 100644 (file)
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -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

diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 8df694dde564e45041f0b091fa8ae9d95e9eee82..f212af3ec74083d62aa8a0765d6a6384198394ec 100644 (file)
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -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