21 files changed, 81 insertions, 78 deletions
diff --git a/linux/drivers/media/video/Kconfig b/linux/drivers/media/video/Kconfig
index e28e292fe..33781089b 100644
--- a/linux/drivers/media/video/Kconfig
+++ b/linux/drivers/media/video/Kconfig
@@ -596,79 +596,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/linux/drivers/media/video/Makefile b/linux/drivers/media/video/Makefile
index bcd23e3cb..745780e1f 100644
--- a/linux/drivers/media/video/Makefile
+++ b/linux/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
@@ -55,9 +53,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/linux/drivers/media/video/zoran/Kconfig b/linux/drivers/media/video/zoran/Kconfig
new file mode 100644
index 000000000..4ea5fa71d
--- /dev/null
+++ b/linux/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/linux/drivers/media/video/zoran/Makefile b/linux/drivers/media/video/zoran/Makefile
new file mode 100644
index 000000000..44cc13352
--- /dev/null
+++ b/linux/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/linux/drivers/media/video/videocodec.c b/linux/drivers/media/video/zoran/videocodec.c
index cf24956f3..cf24956f3 100644
--- a/linux/drivers/media/video/videocodec.c
+++ b/linux/drivers/media/video/zoran/videocodec.c
diff --git a/linux/drivers/media/video/videocodec.h b/linux/drivers/media/video/zoran/videocodec.h
index 1b40df14f..1b40df14f 100644
--- a/linux/drivers/media/video/videocodec.h
+++ b/linux/drivers/media/video/zoran/videocodec.h
diff --git a/linux/drivers/media/video/zoran.h b/linux/drivers/media/video/zoran/zoran.h
index 46b7ad477..46b7ad477 100644
--- a/linux/drivers/media/video/zoran.h
+++ b/linux/drivers/media/video/zoran/zoran.h
diff --git a/linux/drivers/media/video/zoran_card.c b/linux/drivers/media/video/zoran/zoran_card.c
index 081b72a45..081b72a45 100644
--- a/linux/drivers/media/video/zoran_card.c
+++ b/linux/drivers/media/video/zoran/zoran_card.c
diff --git a/linux/drivers/media/video/zoran_card.h b/linux/drivers/media/video/zoran/zoran_card.h
index e4dc9d29b..e4dc9d29b 100644
--- a/linux/drivers/media/video/zoran_card.h
+++ b/linux/drivers/media/video/zoran/zoran_card.h
diff --git a/linux/drivers/media/video/zoran_device.c b/linux/drivers/media/video/zoran/zoran_device.c
index 87f894fa2..87f894fa2 100644
--- a/linux/drivers/media/video/zoran_device.c
+++ b/linux/drivers/media/video/zoran/zoran_device.c
diff --git a/linux/drivers/media/video/zoran_device.h b/linux/drivers/media/video/zoran/zoran_device.h
index d4e0b9b5a..d4e0b9b5a 100644
--- a/linux/drivers/media/video/zoran_device.h
+++ b/linux/drivers/media/video/zoran/zoran_device.h
diff --git a/linux/drivers/media/video/zoran_driver.c b/linux/drivers/media/video/zoran/zoran_driver.c
index 9d57a630c..9d57a630c 100644
--- a/linux/drivers/media/video/zoran_driver.c
+++ b/linux/drivers/media/video/zoran/zoran_driver.c
diff --git a/linux/drivers/media/video/zoran_procfs.c b/linux/drivers/media/video/zoran/zoran_procfs.c
index 961950a21..961950a21 100644
--- a/linux/drivers/media/video/zoran_procfs.c
+++ b/linux/drivers/media/video/zoran/zoran_procfs.c
diff --git a/linux/drivers/media/video/zoran_procfs.h b/linux/drivers/media/video/zoran/zoran_procfs.h
index f2d5b1ba4..f2d5b1ba4 100644
--- a/linux/drivers/media/video/zoran_procfs.h
+++ b/linux/drivers/media/video/zoran/zoran_procfs.h
diff --git a/linux/drivers/media/video/zr36016.c b/linux/drivers/media/video/zoran/zr36016.c
index 693a648e9..693a648e9 100644
--- a/linux/drivers/media/video/zr36016.c
+++ b/linux/drivers/media/video/zoran/zr36016.c
diff --git a/linux/drivers/media/video/zr36016.h b/linux/drivers/media/video/zoran/zr36016.h
index 8c79229f6..8c79229f6 100644
--- a/linux/drivers/media/video/zr36016.h
+++ b/linux/drivers/media/video/zoran/zr36016.h
diff --git a/linux/drivers/media/video/zr36050.c b/linux/drivers/media/video/zoran/zr36050.c
index cf8b271a1..cf8b271a1 100644
--- a/linux/drivers/media/video/zr36050.c
+++ b/linux/drivers/media/video/zoran/zr36050.c
diff --git a/linux/drivers/media/video/zr36050.h b/linux/drivers/media/video/zoran/zr36050.h
index 9f52f0cdd..9f52f0cdd 100644
--- a/linux/drivers/media/video/zr36050.h
+++ b/linux/drivers/media/video/zoran/zr36050.h
diff --git a/linux/drivers/media/video/zr36057.h b/linux/drivers/media/video/zoran/zr36057.h
index 54c9362aa..54c9362aa 100644
--- a/linux/drivers/media/video/zr36057.h
+++ b/linux/drivers/media/video/zoran/zr36057.h
diff --git a/linux/drivers/media/video/zr36060.c b/linux/drivers/media/video/zoran/zr36060.c
index 8e74054d5..8e74054d5 100644
--- a/linux/drivers/media/video/zr36060.c
+++ b/linux/drivers/media/video/zoran/zr36060.c
diff --git a/linux/drivers/media/video/zr36060.h b/linux/drivers/media/video/zoran/zr36060.h
index 914ffa4ad..914ffa4ad 100644
--- a/linux/drivers/media/video/zr36060.h
+++ b/linux/drivers/media/video/zoran/zr36060.h