Commit e5cdf69d authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

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



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

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 3e7c9912

drivers/media/pci/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -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"

drivers/media/pci/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -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/

drivers/media/pci/meye/Kconfig

0 → 100644
+13 −0
Original line number Diff line number Diff line 
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.

drivers/media/pci/meye/Makefile

0 → 100644
+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_VIDEO_MEYE) += meye.o