1 files changed, 24 insertions, 24 deletions

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index f268dbeeb700..f606d2951fde 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -613,9 +613,6 @@ config VIDEO_STRADIS
           driver for PCI.  There is a product page at
           <http://www.stradis.com/>.
 
-config VIDEO_ZORAN_ZR36060
-        tristate
-
 config VIDEO_ZORAN
         tristate "Zoran ZR36057/36067 Video For Linux"
         depends on PCI && I2C_ALGOBIT && VIDEO_V4L1 && VIRT_TO_BUS
@@ -629,61 +626,64 @@ config VIDEO_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 Bus, 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
+        depends on VIDEO_ZORAN_ZR36060
         select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO
         select VIDEO_SAA7185 if VIDEO_HELPER_CHIPS_AUTO
-        select VIDEO_ZORAN_ZR36060
         help
           Support for the Iomega Buz MJPEG capture/playback card.
 
 config VIDEO_ZORAN_DC10
         tristate "Pinnacle/Miro DC10(+) support"
-        depends on VIDEO_ZORAN
-        select VIDEO_SAA7110
+        depends on VIDEO_ZORAN_ZR36060
+        select VIDEO_SAA7110 if VIDEO_HELPER_CHIPS_AUTO
         select VIDEO_ADV7175 if VIDEO_HELPER_CHIPS_AUTO
-        select VIDEO_ZORAN_ZR36060
         help
           Support for the Pinnacle/Miro DC10(+) MJPEG capture/playback
           card.
 
-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_LML33
         tristate "Linux Media Labs LML33 support"
-        depends on VIDEO_ZORAN
+        depends on VIDEO_ZORAN_ZR36060
         select VIDEO_BT819 if VIDEO_HELPER_CHIPS_AUTO
         select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO
-        select VIDEO_ZORAN_ZR36060
         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
+        depends on VIDEO_ZORAN_ZR36060
         select VIDEO_SAA7114 if VIDEO_HELPER_CHIPS_AUTO
         select VIDEO_ADV7170 if VIDEO_HELPER_CHIPS_AUTO
-        select VIDEO_ZORAN_ZR36060
         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 && EXPERIMENTAL && VIDEO_V4L1
+        depends on VIDEO_ZORAN_ZR36060 && EXPERIMENTAL && VIDEO_V4L1
         select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO
         select VIDEO_KS0127 if VIDEO_HELPER_CHIPS_AUTO
-        select VIDEO_ZORAN_ZR36060
         help
           Support for the AverMedia 6 Eyes video surveillance card.