Commit 45d01103 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (9129): zoran: move zoran sources into a zoran subdirectory 



Prevent the zoran driver sources from cluttering the video directory.
This changeset only moves the drivers and it does not fix any of the
checkpatch warnings/errors to keep the changeset clean.

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 19c309e3

drivers/media/video/Kconfig

+1 −73
Original line number Diff line number Diff line
@@ -605,79 +605,7 @@ config VIDEO_STRADIS 
	  driver for PCI.  There is a product page at

	  <http://www.stradis.com/>.



config VIDEO_ZORAN

	tristate "Zoran ZR36057/36067 Video For Linux"

	depends on PCI && I2C_ALGOBIT && VIDEO_V4L1 && VIRT_TO_BUS

	help

	  Say Y for support for MJPEG capture cards based on the Zoran

	  36057/36067 PCI controller chipset. This includes the Iomega

	  Buz, Pinnacle DC10+ and the Linux Media Labs LML33. There is

	  a driver homepage at <http://mjpeg.sf.net/driver-zoran/>. For

	  more information, check <file:Documentation/video4linux/Zoran>.



	  To compile this driver as a module, choose M here: the

	  module will be called zr36067.



config VIDEO_ZORAN_DC30

	tristate "Pinnacle/Miro DC30(+) support"

	depends on VIDEO_ZORAN

	select VIDEO_ADV7175 if VIDEO_HELPER_CHIPS_AUTO

	select VIDEO_VPX3220 if VIDEO_HELPER_CHIPS_AUTO

	help

	  Support for the Pinnacle/Miro DC30(+) MJPEG capture/playback

	  card. This also supports really old DC10 cards based on the

	  zr36050 MJPEG codec and zr36016 VFE.



config VIDEO_ZORAN_ZR36060

	tristate "Zoran ZR36060"

	depends on VIDEO_ZORAN

	help

	  Say Y to support Zoran boards based on 36060 chips.

	  This includes Iomega Buz, Pinnacle DC10, Linux media Labs 33

	  and 33 R10 and AverMedia 6 boards.



config VIDEO_ZORAN_BUZ

	tristate "Iomega Buz support"

	depends on VIDEO_ZORAN_ZR36060

	select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO

	select VIDEO_SAA7185 if VIDEO_HELPER_CHIPS_AUTO

	help

	  Support for the Iomega Buz MJPEG capture/playback card.



config VIDEO_ZORAN_DC10

	tristate "Pinnacle/Miro DC10(+) support"

	depends on VIDEO_ZORAN_ZR36060

	select VIDEO_SAA7110 if VIDEO_HELPER_CHIPS_AUTO

	select VIDEO_ADV7175 if VIDEO_HELPER_CHIPS_AUTO

	help

	  Support for the Pinnacle/Miro DC10(+) MJPEG capture/playback

	  card.



config VIDEO_ZORAN_LML33

	tristate "Linux Media Labs LML33 support"

	depends on VIDEO_ZORAN_ZR36060

	select VIDEO_BT819 if VIDEO_HELPER_CHIPS_AUTO

	select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO

	help

	  Support for the Linux Media Labs LML33 MJPEG capture/playback

	  card.



config VIDEO_ZORAN_LML33R10

	tristate "Linux Media Labs LML33R10 support"

	depends on VIDEO_ZORAN_ZR36060

	select VIDEO_SAA7114 if VIDEO_HELPER_CHIPS_AUTO

	select VIDEO_ADV7170 if VIDEO_HELPER_CHIPS_AUTO

	help

	  support for the Linux Media Labs LML33R10 MJPEG capture/playback

	  card.



config VIDEO_ZORAN_AVS6EYES

	tristate "AverMedia 6 Eyes support (EXPERIMENTAL)"

	depends on VIDEO_ZORAN_ZR36060 && EXPERIMENTAL && VIDEO_V4L1

	select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO

	select VIDEO_KS0127 if VIDEO_HELPER_CHIPS_AUTO

	help

	  Support for the AverMedia 6 Eyes video surveillance card.

source "drivers/media/video/zoran/Kconfig"



config VIDEO_MEYE

	tristate "Sony Vaio Picturebook Motion Eye Video For Linux"

drivers/media/video/Makefile

+1 −5
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ 
# Makefile for the video capture/playback device drivers.

#



zr36067-objs	:=	zoran_procfs.o zoran_device.o \

			zoran_driver.o zoran_card.o

tuner-objs	:=	tuner-core.o



msp3400-objs	:=	msp3400-driver.o msp3400-kthreads.o
@@ -54,9 +52,7 @@ obj-$(CONFIG_VIDEO_BT856) += bt856.o 
obj-$(CONFIG_VIDEO_BT866) += bt866.o

obj-$(CONFIG_VIDEO_KS0127) += ks0127.o



obj-$(CONFIG_VIDEO_ZORAN) += zr36067.o videocodec.o

obj-$(CONFIG_VIDEO_ZORAN_DC30) += zr36050.o zr36016.o

obj-$(CONFIG_VIDEO_ZORAN_ZR36060) += zr36060.o

obj-$(CONFIG_VIDEO_ZORAN) += zoran/



obj-$(CONFIG_VIDEO_PMS) += pms.o

obj-$(CONFIG_VIDEO_VINO) += vino.o indycam.o

drivers/media/video/zoran/Kconfig

0 → 100644
+73 −0
Original line number Diff line number Diff line 
config VIDEO_ZORAN

	tristate "Zoran ZR36057/36067 Video For Linux"

	depends on PCI && I2C_ALGOBIT && VIDEO_V4L1 && VIRT_TO_BUS

	help

	  Say Y for support for MJPEG capture cards based on the Zoran

	  36057/36067 PCI controller chipset. This includes the Iomega

	  Buz, Pinnacle DC10+ and the Linux Media Labs LML33. There is

	  a driver homepage at <http://mjpeg.sf.net/driver-zoran/>. For

	  more information, check <file:Documentation/video4linux/Zoran>.



	  To compile this driver as a module, choose M here: the

	  module will be called zr36067.



config VIDEO_ZORAN_DC30

	tristate "Pinnacle/Miro DC30(+) support"

	depends on VIDEO_ZORAN

	select VIDEO_ADV7175 if VIDEO_HELPER_CHIPS_AUTO

	select VIDEO_VPX3220 if VIDEO_HELPER_CHIPS_AUTO

	help

	  Support for the Pinnacle/Miro DC30(+) MJPEG capture/playback

	  card. This also supports really old DC10 cards based on the

	  zr36050 MJPEG codec and zr36016 VFE.



config VIDEO_ZORAN_ZR36060

	tristate "Zoran ZR36060"

	depends on VIDEO_ZORAN

	help

	  Say Y to support Zoran boards based on 36060 chips.

	  This includes Iomega Buz, Pinnacle DC10, Linux media Labs 33

	  and 33 R10 and AverMedia 6 boards.



config VIDEO_ZORAN_BUZ

	tristate "Iomega Buz support"

	depends on VIDEO_ZORAN_ZR36060

	select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO

	select VIDEO_SAA7185 if VIDEO_HELPER_CHIPS_AUTO

	help

	  Support for the Iomega Buz MJPEG capture/playback card.



config VIDEO_ZORAN_DC10

	tristate "Pinnacle/Miro DC10(+) support"

	depends on VIDEO_ZORAN_ZR36060

	select VIDEO_SAA7110 if VIDEO_HELPER_CHIPS_AUTO

	select VIDEO_ADV7175 if VIDEO_HELPER_CHIPS_AUTO

	help

	  Support for the Pinnacle/Miro DC10(+) MJPEG capture/playback

	  card.



config VIDEO_ZORAN_LML33

	tristate "Linux Media Labs LML33 support"

	depends on VIDEO_ZORAN_ZR36060

	select VIDEO_BT819 if VIDEO_HELPER_CHIPS_AUTO

	select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO

	help

	  Support for the Linux Media Labs LML33 MJPEG capture/playback

	  card.



config VIDEO_ZORAN_LML33R10

	tristate "Linux Media Labs LML33R10 support"

	depends on VIDEO_ZORAN_ZR36060

	select VIDEO_SAA7114 if VIDEO_HELPER_CHIPS_AUTO

	select VIDEO_ADV7170 if VIDEO_HELPER_CHIPS_AUTO

	help

	  support for the Linux Media Labs LML33R10 MJPEG capture/playback

	  card.



config VIDEO_ZORAN_AVS6EYES

	tristate "AverMedia 6 Eyes support (EXPERIMENTAL)"

	depends on VIDEO_ZORAN_ZR36060 && EXPERIMENTAL && VIDEO_V4L1

	select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO

	select VIDEO_KS0127 if VIDEO_HELPER_CHIPS_AUTO

	help

	  Support for the AverMedia 6 Eyes video surveillance card.

drivers/media/video/zoran/Makefile

0 → 100644
+6 −0
Original line number Diff line number Diff line 
zr36067-objs	:=	zoran_procfs.o zoran_device.o \

			zoran_driver.o zoran_card.o



obj-$(CONFIG_VIDEO_ZORAN) += zr36067.o videocodec.o

obj-$(CONFIG_VIDEO_ZORAN_DC30) += zr36050.o zr36016.o

obj-$(CONFIG_VIDEO_ZORAN_ZR36060) += zr36060.o