V4L/DVB (4519): Fixes Helper module dependencies against V4L APIs

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

2 files changed, 332 insertions, 319 deletions

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index fcc16bde021..69a16cab1bd 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -16,6 +16,320 @@ config VIDEO_ADV_DEBUG
           V4L devices.
           In doubt, say N.
 
+config VIDEO_HELPER_CHIPS_AUTO
+        bool "Autoselect pertinent encoders/decoders and other helper chips"
+        default y
+        ---help---
+          Most video cards may require additional modules to encode or
+          decode audio/video standards. This option will autoselect
+          all pertinent modules to each selected video module.
+
+          Unselect this only if you know exaclty what you are doing, since
+          it may break support on some boards.
+
+          In doubt, say Y.
+
+#
+# Encoder / Decoder module configuration
+#
+
+menu "Encoders/decoders and other helper chips"
+        depends on VIDEO_DEV && !VIDEO_HELPER_CHIPS_AUTO
+
+comment "Audio Decoders"
+
+config VIDEO_TVAUDIO
+        tristate "Simple audio decoder chips"
+        depends on VIDEO_V4L1 && I2C
+        ---help---
+          Support for several audio decoder chips found on some bt8xx boards:
+          Philips: tda9840, tda9873h, tda9874h/a, tda9850, tda985x, tea6300,
+                   tea6320, tea6420, tda8425, ta8874z.
+          Microchip: pic16c54 based design on ProVideo PV951 board.
+
+          To compile this driver as a module, choose M here: the
+          module will be called tvaudio.
+
+config VIDEO_TDA7432
+        tristate "Philips TDA7432 audio processor chip"
+        depends on VIDEO_V4L1 && I2C
+        ---help---
+          Support for tda7432 audio decoder chip found on some bt8xx boards.
+
+          To compile this driver as a module, choose M here: the
+          module will be called tda7432.
+
+config VIDEO_TDA9840
+        tristate "Philips TDA9840 audio processor chip"
+        depends on VIDEO_DEV && I2C
+        ---help---
+          Support for tda9840 audio decoder chip found on some Zoran boards.
+
+          To compile this driver as a module, choose M here: the
+          module will be called tda9840.
+
+config VIDEO_TDA9875
+        tristate "Philips TDA9875 audio processor chip"
+        depends on VIDEO_V4L1 && I2C
+        ---help---
+          Support for tda9875 audio decoder chip found on some bt8xx boards.
+
+          To compile this driver as a module, choose M here: the
+          module will be called tda9875.
+
+config VIDEO_TEA6415C
+        tristate "Philips TEA6415C audio processor chip"
+        depends on VIDEO_DEV && I2C
+        ---help---
+          Support for tea6415c audio decoder chip found on some bt8xx boards.
+
+          To compile this driver as a module, choose M here: the
+          module will be called tea6415c.
+
+config VIDEO_TEA6420
+        tristate "Philips TEA6420 audio processor chip"
+        depends on VIDEO_DEV && I2C
+        ---help---
+          Support for tea6420 audio decoder chip found on some bt8xx boards.
+
+          To compile this driver as a module, choose M here: the
+          module will be called tea6420.
+
+config VIDEO_MSP3400
+        tristate "Micronas MSP34xx audio decoders"
+        depends on VIDEO_V4L2 && I2C
+        ---help---
+          Support for the Micronas MSP34xx series of audio decoders.
+
+          To compile this driver as a module, choose M here: the
+          module will be called msp3400.
+
+config VIDEO_CS53L32A
+        tristate "Cirrus Logic CS53L32A audio ADC"
+        depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
+        ---help---
+          Support for the Cirrus Logic CS53L32A low voltage
+          stereo A/D converter.
+
+          To compile this driver as a module, choose M here: the
+          module will be called cs53l32a.
+
+config VIDEO_TLV320AIC23B
+        tristate "Texas Instruments TLV320AIC23B audio codec"
+        depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
+        ---help---
+          Support for the Texas Instruments TLV320AIC23B audio codec.
+
+          To compile this driver as a module, choose M here: the
+          module will be called tlv320aic23b.
+
+config VIDEO_WM8775
+        tristate "Wolfson Microelectronics WM8775 audio ADC with input mixer"
+        depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
+        ---help---
+          Support for the Wolfson Microelectronics WM8775 high
+          performance stereo A/D Converter with a 4 channel input mixer.
+
+          To compile this driver as a module, choose M here: the
+          module will be called wm8775.
+
+config VIDEO_WM8739
+        tristate "Wolfson Microelectronics WM8739 stereo audio ADC"
+        depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
+        ---help---
+          Support for the Wolfson Microelectronics WM8739
+          stereo A/D Converter.
+
+          To compile this driver as a module, choose M here: the
+          module will be called wm8739.
+
+comment "MPEG video encoders"
+
+config VIDEO_CX2341X
+        tristate "Conexant CX2341x MPEG encoders"
+        depends on VIDEO_V4L2 && EXPERIMENTAL
+        ---help---
+          Support for the Conexant CX23416 MPEG encoders
+          and CX23415 MPEG encoder/decoders.
+
+          This module currently supports the encoding functions only.
+
+          To compile this driver as a module, choose M here: the
+          module will be called cx2341x.
+
+source "drivers/media/video/cx25840/Kconfig"
+
+comment "Video encoders"
+
+config VIDEO_SAA7127
+        tristate "Philips SAA7127/9 digital video encoders"
+        depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
+        ---help---
+          Support for the Philips SAA7127/9 digital video encoders.
+
+          To compile this driver as a module, choose M here: the
+          module will be called saa7127.
+
+config VIDEO_SAA7185
+        tristate "Philips SAA7185 video encoder"
+        depends on VIDEO_V4L1 && I2C
+        ---help---
+          Support for the Philips SAA7185 video encoder.
+
+          To compile this driver as a module, choose M here: the
+          module will be called saa7185.
+
+config VIDEO_ADV7170
+        tristate "Analog Devices ADV7170 video encoder driver"
+        depends on VIDEO_V4L1 && I2C
+        ---help---
+          Support for the Analog Devices ADV7170 video encoder driver
+
+          To compile this driver as a module, choose M here: the
+          module will be called adv7170.
+
+config VIDEO_ADV7175
+        tristate "Analog Devices ADV7175 video encoder driver"
+        depends on VIDEO_V4L1 && I2C
+        ---help---
+          Support for the Analog Devices ADV7175 video encoder driver
+
+          To compile this driver as a module, choose M here: the
+          module will be called adv7175.
+
+comment "Video decoders"
+
+config VIDEO_BT819
+        tristate "BT819A VideoStream Decoder"
+        depends on VIDEO_V4L1 && I2C
+        ---help---
+          Support for BT819A video decoder.
+
+          To compile this driver as a module, choose M here: the
+          module will be called bt819.
+
+config VIDEO_BT856
+        tristate "BT856 VideoStream Decoder"
+        depends on VIDEO_V4L1 && I2C
+        ---help---
+          Support for BT856 video decoder.
+
+          To compile this driver as a module, choose M here: the
+          module will be called bt856.
+
+config VIDEO_BT866
+        tristate "BT866 VideoStream Decoder"
+        depends on VIDEO_V4L1 && I2C
+        ---help---
+          Support for BT866 video decoder.
+
+          To compile this driver as a module, choose M here: the
+          module will be called bt866.
+
+config VIDEO_KS0127
+        tristate "KS0127 video decoder"
+        depends on VIDEO_V4L1 && I2C
+        ---help---
+          Support for KS0127 video decoder.
+
+          This chip is used on AverMedia AVS6EYES Zoran-based MJPEG
+          cards.
+
+          To compile this driver as a module, choose M here: the
+          module will be called ks0127.
+
+config VIDEO_SAA7110
+        tristate "Philips SAA7110 video decoder"
+        depends on VIDEO_V4L1
+        ---help---
+          Support for the Philips SAA7110 video decoders.
+
+          To compile this driver as a module, choose M here: the
+          module will be called saa7110.
+
+config VIDEO_SAA7111
+        tristate "Philips SAA7111 video decoder"
+        depends on VIDEO_V4L1 && I2C
+        ---help---
+          Support for the Philips SAA711 video decoder.
+
+          To compile this driver as a module, choose M here: the
+          module will be called saa7111.
+
+config VIDEO_SAA7114
+        tristate "Philips SAA7114 video decoder"
+        depends on VIDEO_V4L1 && I2C
+        ---help---
+          Support for the Philips SAA7114 video decoder. This driver
+          is used only on Zoran driver and should be moved soon to
+          SAA711x module.
+
+          To compile this driver as a module, choose M here: the
+          module will be called saa7114.
+
+config VIDEO_SAA711X
+        tristate "Philips SAA7113/4/5 video decoders"
+        depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
+        ---help---
+          Support for the Philips SAA7113/4/5 video decoders.
+
+          To compile this driver as a module, choose M here: the
+          module will be called saa7115.
+
+config VIDEO_SAA7191
+        tristate "Philips SAA7191 video decoder"
+        depends on VIDEO_V4L1 && I2C
+        ---help---
+          Support for the Philips SAA7191 video decoder.
+
+          To compile this driver as a module, choose M here: the
+          module will be called saa7191.
+
+config VIDEO_TVP5150
+        tristate "Texas Instruments TVP5150 video decoder"
+        depends on VIDEO_V4L2 && I2C
+        ---help---
+          Support for the Texas Instruments TVP5150 video decoder.
+
+          To compile this driver as a module, choose M here: the
+          module will be called tvp5150.
+
+config VIDEO_VPX3220
+        tristate "vpx3220a, vpx3216b & vpx3214c video decoder driver"
+        depends on VIDEO_V4L1 && I2C
+        ---help---
+          Support for VPX322x video decoders.
+
+          To compile this driver as a module, choose M here: the
+          module will be called vpx3220.
+
+comment "Video improvement chips"
+
+config VIDEO_UPD64031A
+        tristate "NEC Electronics uPD64031A Ghost Reduction"
+        depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
+        ---help---
+          Support for the NEC Electronics uPD64031A Ghost Reduction
+          video chip. It is most often found in NTSC TV cards made for
+          Japan and is used to reduce the 'ghosting' effect that can
+          be present in analog TV broadcasts.
+
+          To compile this driver as a module, choose M here: the
+          module will be called upd64031a.
+
+config VIDEO_UPD64083
+        tristate "NEC Electronics uPD64083 3-Dimensional Y/C separation"
+        depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
+        ---help---
+          Support for the NEC Electronics uPD64083 3-Dimensional Y/C
+          separation video chip. It is used to improve the quality of
+          the colors of a composite signal.
+
+          To compile this driver as a module, choose M here: the
+          module will be called upd64083.
+
+endmenu # encoder / decoder chips
+
 config VIDEO_VIVI
         tristate "Virtual Video Driver"
         depends on VIDEO_V4L2 && !SPARC32 && !SPARC64
@@ -164,7 +478,7 @@ config VIDEO_VINO
         tristate "SGI Vino Video For Linux (EXPERIMENTAL)"
         depends on I2C && SGI_IP22 && EXPERIMENTAL && VIDEO_V4L2
         select I2C_ALGO_SGI
-        select VIDEO_SAA7191
+        select VIDEO_SAA7191 if VIDEO_HELPER_CHIPS_AUTO
         help
           Say Y here to build in support for the Vino video input system found
           on SGI Indy machines.
@@ -196,8 +510,8 @@ config VIDEO_ZORAN
 config VIDEO_ZORAN_BUZ
         tristate "Iomega Buz support"
         depends on VIDEO_ZORAN
-        select VIDEO_SAA7111
-        select VIDEO_SAA7185
+        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.
@@ -206,7 +520,7 @@ config VIDEO_ZORAN_DC10
         tristate "Pinnacle/Miro DC10(+) support"
         depends on VIDEO_ZORAN
         select VIDEO_SAA7110
-        select VIDEO_ADV7175
+        select VIDEO_ADV7175 if VIDEO_HELPER_CHIPS_AUTO
         select VIDEO_ZORAN_ZR36060
         help
           Support for the Pinnacle/Miro DC10(+) MJPEG capture/playback
@@ -215,8 +529,8 @@ config VIDEO_ZORAN_DC10
 config VIDEO_ZORAN_DC30
         tristate "Pinnacle/Miro DC30(+) support"
         depends on VIDEO_ZORAN
-        select VIDEO_ADV7175
-        select VIDEO_VPX3220
+        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
@@ -225,8 +539,8 @@ config VIDEO_ZORAN_DC30
 config VIDEO_ZORAN_LML33
         tristate "Linux Media Labs LML33 support"
         depends on VIDEO_ZORAN
-        select VIDEO_BT819
-        select VIDEO_BT856
+        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
@@ -235,8 +549,8 @@ config VIDEO_ZORAN_LML33
 config VIDEO_ZORAN_LML33R10
         tristate "Linux Media Labs LML33R10 support"
         depends on VIDEO_ZORAN
-        select VIDEO_SAA7114
-        select VIDEO_ADV7170
+        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
@@ -245,8 +559,8 @@ config VIDEO_ZORAN_LML33R10
 config VIDEO_ZORAN_AVS6EYES
         tristate "AverMedia 6 Eyes support (EXPERIMENTAL)"
         depends on VIDEO_ZORAN && EXPERIMENTAL && VIDEO_V4L1
-        select VIDEO_BT856
-        select VIDEO_KS0127
+        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.
@@ -284,10 +598,10 @@ config VIDEO_MXB
         depends on PCI && VIDEO_V4L1
         select VIDEO_SAA7146_VV
         select VIDEO_TUNER
-        select VIDEO_SAA7111
-        select VIDEO_TDA9840
-        select VIDEO_TEA6415C
-        select VIDEO_TEA6420
+        select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO
+        select VIDEO_TDA9840 if VIDEO_HELPER_CHIPS_AUTO
+        select VIDEO_TEA6415C if VIDEO_HELPER_CHIPS_AUTO
+        select VIDEO_TEA6420 if VIDEO_HELPER_CHIPS_AUTO
         ---help---
           This is a video4linux driver for the 'Multimedia eXtension Board'
           TV card by Siemens-Nixdorf.
@@ -299,7 +613,7 @@ config VIDEO_DPC
         tristate "Philips-Semiconductors 'dpc7146 demonstration board'"
         depends on PCI && VIDEO_V4L1
         select VIDEO_SAA7146_VV
-        select VIDEO_SAA7111
+        select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO
         ---help---
           This is a video4linux driver for the 'dpc7146 demonstration
           board' by Philips-Semiconductors. It's the reference design
@@ -355,313 +669,12 @@ config VIDEO_M32R_AR_M64278
           module will be called arv.
 
 #
-# Encoder / Decoder module configuration
-#
-
-menu "Encoders and Decoders"
-        depends on VIDEO_DEV
-
-comment "Audio Decoders"
-
-config VIDEO_TVAUDIO
-        tristate "Support for several audio decoder chips found on bt8xx boards"
-        depends on VIDEO_DEV && I2C
-        ---help---
-          Support for several audio decoder chips found on some bt8xx boards:
-                tda8425, tea6300, tea6420, tea9840, tda985x, tda9874, pic16c54.
-
-          To compile this driver as a module, choose M here: the
-          module will be called tvaudio.
-
-config VIDEO_TDA7432
-        tristate "Support for tda7432 chip"
-        depends on VIDEO_DEV && I2C
-        ---help---
-          Support for tda7432 audio decoder chip found on some bt8xx boards.
-
-          To compile this driver as a module, choose M here: the
-          module will be called tda7432.
-
-config VIDEO_TDA9840
-        tristate "Support for tda9840 chip"
-        depends on VIDEO_DEV && I2C
-        ---help---
-          Support for tda9840 audio decoder chip found on some Zoran boards.
-
-          To compile this driver as a module, choose M here: the
-          module will be called tda9840.
-
-config VIDEO_TDA9875
-        tristate "Support for tda9875 chip"
-        depends on VIDEO_DEV && I2C
-        ---help---
-          Support for tda9875 audio decoder chip found on some bt8xx boards.
-
-          To compile this driver as a module, choose M here: the
-          module will be called tda9875.
-
-config VIDEO_TEA6415C
-        tristate "Support for tea6415c chip"
-        depends on VIDEO_DEV && I2C
-        ---help---
-          Support for tea6415c audio decoder chip found on some bt8xx boards.
-
-          To compile this driver as a module, choose M here: the
-          module will be called tea6415c.
-
-config VIDEO_TEA6420
-        tristate "Support for tea6420 chip"
-        depends on VIDEO_DEV && I2C
-        ---help---
-          Support for tea6420 audio decoder chip found on some bt8xx boards.
-
-          To compile this driver as a module, choose M here: the
-          module will be called tea6420.
-
-config VIDEO_MSP3400
-        tristate "Micronas MSP34xx audio decoders"
-        depends on VIDEO_DEV && I2C
-        ---help---
-          Support for the Micronas MSP34xx series of audio decoders.
-
-          To compile this driver as a module, choose M here: the
-          module will be called msp3400.
-
-config VIDEO_CS53L32A
-        tristate "Cirrus Logic CS53L32A audio ADC"
-        depends on VIDEO_DEV && I2C && EXPERIMENTAL
-        ---help---
-          Support for the Cirrus Logic CS53L32A low voltage
-          stereo A/D converter.
-
-          To compile this driver as a module, choose M here: the
-          module will be called cs53l32a.
-
-config VIDEO_TLV320AIC23B
-        tristate "Texas Instruments TLV320AIC23B audio codec"
-        depends on VIDEO_DEV && I2C && EXPERIMENTAL
-        ---help---
-          Support for the Texas Instruments TLV320AIC23B audio codec.
-
-          To compile this driver as a module, choose M here: the
-          module will be called tlv320aic23b.
-
-config VIDEO_WM8775
-        tristate "Wolfson Microelectronics WM8775 audio ADC with input mixer"
-        depends on VIDEO_DEV && I2C && EXPERIMENTAL
-        ---help---
-          Support for the Wolfson Microelectronics WM8775 high
-          performance stereo A/D Converter with a 4 channel input mixer.
-
-          To compile this driver as a module, choose M here: the
-          module will be called wm8775.
-
-config VIDEO_WM8739
-        tristate "Wolfson Microelectronics WM8739 stereo audio ADC"
-        depends on VIDEO_DEV && I2C && EXPERIMENTAL
-        ---help---
-          Support for the Wolfson Microelectronics WM8739
-          stereo A/D Converter.
-
-          To compile this driver as a module, choose M here: the
-          module will be called wm8739.
-
-comment "MPEG video encoders"
-
-config VIDEO_CX2341X
-        tristate "Conexant CX2341x MPEG encoders"
-        depends on VIDEO_V4L2 && EXPERIMENTAL
-        ---help---
-          Support for the Conexant CX23416 MPEG encoders
-          and CX23415 MPEG encoder/decoders.
-
-          This module currently supports the encoding functions only.
-
-          To compile this driver as a module, choose M here: the
-          module will be called cx2341x.
-
-source "drivers/media/video/cx25840/Kconfig"
-
-config VIDEO_SAA7185
-        tristate "Philips SAA7185 video encoder"
-        depends on VIDEO_DEV && I2C
-        ---help---
-          Support for the Philips SAA7185 video encoder.
-
-          To compile this driver as a module, choose M here: the
-          module will be called saa7185.
-
-comment "Video encoders"
-
-config VIDEO_SAA7127
-        tristate "Philips SAA7127/9 digital video encoders"
-        depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
-        ---help---
-          Support for the Philips SAA7127/9 digital video encoders.
-
-          To compile this driver as a module, choose M here: the
-          module will be called saa7127.
-
-config VIDEO_ADV7170
-        tristate "Analog Devices ADV7170 video encoder driver"
-        depends on VIDEO_V4L2 && I2C
-        ---help---
-          Support for the Analog Devices ADV7170 video encoder driver
-
-          To compile this driver as a module, choose M here: the
-          module will be called adv7170.
-
-config VIDEO_ADV7175
-        tristate "Analog Devices ADV7175 video encoder driver"
-        depends on VIDEO_V4L2 && I2C
-        ---help---
-          Support for the Analog Devices ADV7175 video encoder driver
-
-          To compile this driver as a module, choose M here: the
-          module will be called adv7175.
-
-comment "Video decoders"
-
-config VIDEO_BT819
-        tristate "BT819A VideoStream Decoder"
-        depends on VIDEO_DEV && I2C
-        ---help---
-          Support for BT819A video decoder.
-
-          To compile this driver as a module, choose M here: the
-          module will be called bt819.
-
-config VIDEO_BT856
-        tristate "BT856 VideoStream Decoder"
-        depends on VIDEO_DEV && I2C
-        ---help---
-          Support for BT856 video decoder.
-
-          To compile this driver as a module, choose M here: the
-          module will be called bt856.
-
-config VIDEO_BT866
-        tristate "BT866 VideoStream Decoder"
-        depends on VIDEO_DEV && I2C
-        ---help---
-          Support for BT866 video decoder.
-
-          To compile this driver as a module, choose M here: the
-          module will be called bt866.
-
-config VIDEO_KS0127
-        tristate "KS0127 video decoder"
-        depends on VIDEO_V4L1 && I2C
-        ---help---
-          Support for KS0127 video decoder.
-
-          This chip is used on AverMedia AVS6EYES Zoran-based MJPEG
-          cards.
-
-          To compile this driver as a module, choose M here: the
-          module will be called ks0127.
-
-config VIDEO_SAA7110
-        tristate "Philips SAA7110 video decoder"
-        depends on VIDEO_DEV
-        ---help---
-          Support for the Philips SAA7110 video decoders.
-
-          To compile this driver as a module, choose M here: the
-          module will be called saa7110.
-
-config VIDEO_SAA7111
-        tristate "Philips SAA7111 video decoder"
-        depends on VIDEO_DEV && I2C
-        ---help---
-          Support for the Philips SAA711 video decoder.
-
-          To compile this driver as a module, choose M here: the
-          module will be called saa7111.
-
-config VIDEO_SAA7114
-        tristate "Philips SAA7114 video decoder"
-        depends on VIDEO_DEV && I2C
-        ---help---
-          Support for the Philips SAA7114 video decoder. This driver
-          is used only on Zoran driver and should be moved soon to
-          SAA711x module.
-
-          To compile this driver as a module, choose M here: the
-          module will be called saa7114.
-
-config VIDEO_SAA711X
-        tristate "Philips SAA7113/4/5 video decoders"
-        depends on VIDEO_DEV && I2C && EXPERIMENTAL
-        ---help---
-          Support for the Philips SAA7113/4/5 video decoders.
-
-          To compile this driver as a module, choose M here: the
-          module will be called saa7115.
-
-config VIDEO_SAA7191
-        tristate "Philips SAA7191 video decoder"
-        depends on VIDEO_DEV && I2C
-        ---help---
-          Support for the Philips SAA7191 video decoder.
-
-          To compile this driver as a module, choose M here: the
-          module will be called saa7191.
-
-config VIDEO_TVP5150
-        tristate "Texas Instruments TVP5150 video decoder"
-        depends on VIDEO_DEV && I2C
-        ---help---
-          Support for the Texas Instruments TVP5150 video decoder.
-
-          To compile this driver as a module, choose M here: the
-          module will be called tvp5150.
-
-config VIDEO_VPX3220
-        tristate "vpx3220a, vpx3216b & vpx3214c video decoder driver"
-        depends on VIDEO_DEV && I2C
-        ---help---
-          Support for VPX322x video decoders.
-
-          To compile this driver as a module, choose M here: the
-          module will be called vpx3220.
-
-comment "Video improvement chips"
-
-config VIDEO_UPD64031A
-        tristate "NEC Electronics uPD64031A Ghost Reduction"
-        depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
-        ---help---
-          Support for the NEC Electronics uPD64031A Ghost Reduction
-          video chip. It is most often found in NTSC TV cards made for
-          Japan and is used to reduce the 'ghosting' effect that can
-          be present in analog TV broadcasts.
-
-          To compile this driver as a module, choose M here: the
-          module will be called upd64031a.
-
-config VIDEO_UPD64083
-        tristate "NEC Electronics uPD64083 3-Dimensional Y/C separation"
-        depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
-        ---help---
-          Support for the NEC Electronics uPD64083 3-Dimensional Y/C
-          separation video chip. It is used to improve the quality of
-          the colors of a composite signal.
-
-          To compile this driver as a module, choose M here: the
-          module will be called upd64083.
-
-endmenu # encoder / decoder chips
-
-#
 # USB Multimedia device configuration
 #
 
 menu "V4L USB devices"
         depends on USB && VIDEO_DEV
 
-source "drivers/media/video/pvrusb2/Kconfig"
-
 source "drivers/media/video/em28xx/Kconfig"
 
 source "drivers/media/video/usbvideo/Kconfig"
diff --git a/drivers/media/video/cx25840/Kconfig b/drivers/media/video/cx25840/Kconfig
index 854264e42ec..7cf29a03ed6 100644
--- a/drivers/media/video/cx25840/Kconfig
+++ b/drivers/media/video/cx25840/Kconfig
@@ -1,6 +1,6 @@
 config VIDEO_CX25840
         tristate "Conexant CX2584x audio/video decoders"
-        depends on VIDEO_DEV && I2C && EXPERIMENTAL
+        depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
         select FW_LOADER
         ---help---
           Support for the Conexant CX2584x audio/video decoders.