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: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

21 files changed, 81 insertions, 78 deletions

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 2dce16f863b..47102c2c825 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -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"
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 28e32572530..16962f3aa15 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -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
diff --git a/drivers/media/video/zoran/Kconfig b/drivers/media/video/zoran/Kconfig
new file mode 100644
index 00000000000..4ea5fa71de8
--- /dev/null
+++ b/drivers/media/video/zoran/Kconfig
@@ -0,0 +1,73 @@
+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.
diff --git a/drivers/media/video/zoran/Makefile b/drivers/media/video/zoran/Makefile
new file mode 100644
index 00000000000..44cc13352c8
--- /dev/null
+++ b/drivers/media/video/zoran/Makefile
@@ -0,0 +1,6 @@
+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
diff --git a/drivers/media/video/videocodec.c b/drivers/media/video/zoran/videocodec.c
index cf24956f320..cf24956f320 100644
--- a/drivers/media/video/videocodec.c
+++ b/drivers/media/video/zoran/videocodec.c
diff --git a/drivers/media/video/videocodec.h b/drivers/media/video/zoran/videocodec.h
index 97a3bbeda50..97a3bbeda50 100644
--- a/drivers/media/video/videocodec.h
+++ b/drivers/media/video/zoran/videocodec.h
diff --git a/drivers/media/video/zoran.h b/drivers/media/video/zoran/zoran.h
index 46b7ad477ce..46b7ad477ce 100644
--- a/drivers/media/video/zoran.h
+++ b/drivers/media/video/zoran/zoran.h
diff --git a/drivers/media/video/zoran_card.c b/drivers/media/video/zoran/zoran_card.c
index 3282be73029..3282be73029 100644
--- a/drivers/media/video/zoran_card.c
+++ b/drivers/media/video/zoran/zoran_card.c
diff --git a/drivers/media/video/zoran_card.h b/drivers/media/video/zoran/zoran_card.h
index e4dc9d29b40..e4dc9d29b40 100644
--- a/drivers/media/video/zoran_card.h
+++ b/drivers/media/video/zoran/zoran_card.h
diff --git a/drivers/media/video/zoran_device.c b/drivers/media/video/zoran/zoran_device.c
index 5d948ff7faf..5d948ff7faf 100644
--- a/drivers/media/video/zoran_device.c
+++ b/drivers/media/video/zoran/zoran_device.c
diff --git a/drivers/media/video/zoran_device.h b/drivers/media/video/zoran/zoran_device.h
index 74c6c8edb7d..74c6c8edb7d 100644
--- a/drivers/media/video/zoran_device.h
+++ b/drivers/media/video/zoran/zoran_device.h
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c
index 25de7631443..25de7631443 100644
--- a/drivers/media/video/zoran_driver.c
+++ b/drivers/media/video/zoran/zoran_driver.c
diff --git a/drivers/media/video/zoran_procfs.c b/drivers/media/video/zoran/zoran_procfs.c
index 870bc5a70e3..870bc5a70e3 100644
--- a/drivers/media/video/zoran_procfs.c
+++ b/drivers/media/video/zoran/zoran_procfs.c
diff --git a/drivers/media/video/zoran_procfs.h b/drivers/media/video/zoran/zoran_procfs.h
index f2d5b1ba448..f2d5b1ba448 100644
--- a/drivers/media/video/zoran_procfs.h
+++ b/drivers/media/video/zoran/zoran_procfs.h
diff --git a/drivers/media/video/zr36016.c b/drivers/media/video/zoran/zr36016.c
index 00d132bcd1e..00d132bcd1e 100644
--- a/drivers/media/video/zr36016.c
+++ b/drivers/media/video/zoran/zr36016.c
diff --git a/drivers/media/video/zr36016.h b/drivers/media/video/zoran/zr36016.h
index 8c79229f69d..8c79229f69d 100644
--- a/drivers/media/video/zr36016.h
+++ b/drivers/media/video/zoran/zr36016.h
diff --git a/drivers/media/video/zr36050.c b/drivers/media/video/zoran/zr36050.c
index cf8b271a1c8..cf8b271a1c8 100644
--- a/drivers/media/video/zr36050.c
+++ b/drivers/media/video/zoran/zr36050.c
diff --git a/drivers/media/video/zr36050.h b/drivers/media/video/zoran/zr36050.h
index 9f52f0cdde5..9f52f0cdde5 100644
--- a/drivers/media/video/zr36050.h
+++ b/drivers/media/video/zoran/zr36050.h
diff --git a/drivers/media/video/zr36057.h b/drivers/media/video/zoran/zr36057.h
index 54c9362aa98..54c9362aa98 100644
--- a/drivers/media/video/zr36057.h
+++ b/drivers/media/video/zoran/zr36057.h
diff --git a/drivers/media/video/zr36060.c b/drivers/media/video/zoran/zr36060.c
index 8e74054d5ef..8e74054d5ef 100644
--- a/drivers/media/video/zr36060.c
+++ b/drivers/media/video/zoran/zr36060.c
diff --git a/drivers/media/video/zr36060.h b/drivers/media/video/zoran/zr36060.h
index 914ffa4ad8d..914ffa4ad8d 100644
--- a/drivers/media/video/zr36060.h
+++ b/drivers/media/video/zoran/zr36060.h