media: Kconfig: cleanup VIDEO_DEV dependencies

[sfrench/cifs-2.6.git] / drivers / media / radio / Kconfig

diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index d29e29645e04ace8ffc6f8707071b1b4be8b8c0a..58c10a2ed2922d02abb295262104f403d8dce7fa 100644 (file)
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -5,13 +5,13 @@
 
 menuconfig RADIO_ADAPTERS
        bool "Radio Adapters"
-       depends on VIDEO_V4L2
+       depends on VIDEO_DEV
        depends on MEDIA_RADIO_SUPPORT
        default y
        help
          Say Y here to enable selecting AM/FM radio adapters.
 
-if RADIO_ADAPTERS && VIDEO_V4L2
+if RADIO_ADAPTERS
 
 config RADIO_TEA575X
        tristate
@@ -20,13 +20,12 @@ source "drivers/media/radio/si470x/Kconfig"
 
 config RADIO_SI4713
        tristate "Silicon Labs Si4713 FM Radio with RDS Transmitter support"
-       depends on VIDEO_V4L2
 
 source "drivers/media/radio/si4713/Kconfig"
 
 config RADIO_SI476X
        tristate "Silicon Laboratories Si476x I2C FM Radio"
-       depends on I2C && VIDEO_V4L2
+       depends on I2C
        depends on MFD_SI476X_CORE
        depends on SND_SOC
        select SND_SOC_SI476X
@@ -43,7 +42,7 @@ config RADIO_SI476X
 
 config USB_MR800
        tristate "AverMedia MR 800 USB FM radio support"
-       depends on USB && VIDEO_V4L2
+       depends on USB
        help
          Say Y here if you want to connect this type of radio to your
          computer's USB port. Note that the audio is not digital, and
@@ -55,7 +54,7 @@ config USB_MR800
 
 config USB_DSBR
        tristate "D-Link/GemTek USB FM radio support"
-       depends on USB && VIDEO_V4L2
+       depends on USB
        help
          Say Y here if you want to connect this type of radio to your
          computer's USB port. Note that the audio is not digital, and
@@ -67,7 +66,7 @@ config USB_DSBR
 
 config RADIO_MAXIRADIO
        tristate "Guillemot MAXI Radio FM 2000 radio"
-       depends on VIDEO_V4L2 && PCI
+       depends on PCI
        select RADIO_TEA575X
        help
          Choose Y here if you have this radio card.  This card may also be
@@ -118,7 +117,7 @@ config RADIO_SHARK2
 
 config USB_KEENE
        tristate "Keene FM Transmitter USB support"
-       depends on USB && VIDEO_V4L2
+       depends on USB
        help
          Say Y here if you want to connect this type of FM transmitter
          to your computer's USB port.
@@ -128,7 +127,7 @@ config USB_KEENE
 
 config USB_RAREMONO
        tristate "Thanko's Raremono AM/FM/SW radio support"
-       depends on USB && VIDEO_V4L2
+       depends on USB
        help
          The 'Thanko's Raremono' device contains the Si4734 chip from Silicon Labs Inc.
          It is one of the very few or perhaps the only consumer USB radio device
@@ -142,7 +141,7 @@ config USB_RAREMONO
 
 config USB_MA901
        tristate "Masterkit MA901 USB FM radio support"
-       depends on USB && VIDEO_V4L2
+       depends on USB
        help
          Say Y here if you want to connect this type of radio to your
          computer's USB port. Note that the audio is not digital, and
@@ -154,7 +153,7 @@ config USB_MA901
 
 config RADIO_TEA5764
        tristate "TEA5764 I2C FM radio support"
-       depends on I2C && VIDEO_V4L2
+       depends on I2C
        help
          Say Y here if you want to use the TEA5764 FM chip found in
          EZX phones. This FM chip is present in EZX phones from Motorola,
@@ -173,7 +172,7 @@ config RADIO_TEA5764_XTAL
 
 config RADIO_SAA7706H
        tristate "SAA7706H Car Radio DSP"
-       depends on I2C && VIDEO_V4L2
+       depends on I2C
        help
          Say Y here if you want to use the SAA7706H Car radio Digital
          Signal Processor, found for instance on the Russellville development
@@ -185,7 +184,7 @@ config RADIO_SAA7706H
 
 config RADIO_TEF6862
        tristate "TEF6862 Car Radio Enhanced Selectivity Tuner"
-       depends on I2C && VIDEO_V4L2
+       depends on I2C
        help
          Say Y here if you want to use the TEF6862 Car Radio Enhanced
          Selectivity Tuner, found for instance on the Russellville development
@@ -197,7 +196,7 @@ config RADIO_TEF6862
 
 config RADIO_TIMBERDALE
        tristate "Enable the Timberdale radio driver"
-       depends on MFD_TIMBERDALE && VIDEO_V4L2
+       depends on MFD_TIMBERDALE
        depends on I2C  # for RADIO_SAA7706H
        select RADIO_TEF6862
        select RADIO_SAA7706H
@@ -208,7 +207,7 @@ config RADIO_TIMBERDALE
 
 config RADIO_WL1273
        tristate "Texas Instruments WL1273 I2C FM Radio"
-       depends on I2C && VIDEO_V4L2
+       depends on I2C
        select MFD_CORE
        select MFD_WL1273_CORE
        select FW_LOADER
@@ -245,7 +244,6 @@ config RADIO_ISA
 config RADIO_CADET
        tristate "ADS Cadet AM/FM Tuner"
        depends on ISA || COMPILE_TEST
-       depends on VIDEO_V4L2
        help
          Choose Y here if you have one of these AM/FM radio cards, and then
          fill in the port address below.
@@ -256,7 +254,6 @@ config RADIO_CADET
 config RADIO_RTRACK
        tristate "AIMSlab RadioTrack (aka RadioReveal) support"
        depends on ISA || COMPILE_TEST
-       depends on VIDEO_V4L2
        select RADIO_ISA
        help
          Choose Y here if you have one of these FM radio cards, and then fill
@@ -288,7 +285,6 @@ config RADIO_RTRACK_PORT
 config RADIO_RTRACK2
        tristate "AIMSlab RadioTrack II support"
        depends on ISA || COMPILE_TEST
-       depends on VIDEO_V4L2
        select RADIO_ISA
        help
          Choose Y here if you have this FM radio card, and then fill in the
@@ -312,7 +308,6 @@ config RADIO_RTRACK2_PORT
 config RADIO_AZTECH
        tristate "Aztech/Packard Bell Radio"
        depends on ISA || COMPILE_TEST
-       depends on VIDEO_V4L2
        select RADIO_ISA
        help
          Choose Y here if you have one of these FM radio cards, and then fill
@@ -333,7 +328,6 @@ config RADIO_AZTECH_PORT
 config RADIO_GEMTEK
        tristate "GemTek Radio card (or compatible) support"
        depends on ISA || COMPILE_TEST
-       depends on VIDEO_V4L2
        select RADIO_ISA
        help
          Choose Y here if you have this FM radio card, and then fill in the
@@ -374,7 +368,7 @@ config RADIO_GEMTEK_PROBE
 config RADIO_MIROPCM20
        tristate "miroSOUND PCM20 radio"
        depends on ISA || COMPILE_TEST
-       depends on ISA_DMA_API && VIDEO_V4L2 && SND
+       depends on ISA_DMA_API && SND
        select SND_ISA
        select SND_MIRO
        help
@@ -389,7 +383,6 @@ config RADIO_MIROPCM20
 config RADIO_SF16FMI
        tristate "SF16-FMI/SF16-FMP/SF16-FMD Radio"
        depends on ISA || COMPILE_TEST
-       depends on VIDEO_V4L2
        help
          Choose Y here if you have one of these FM radio cards.
 
@@ -399,7 +392,6 @@ config RADIO_SF16FMI
 config RADIO_SF16FMR2
        tristate "SF16-FMR2/SF16-FMD2 Radio"
        depends on ISA || COMPILE_TEST
-       depends on VIDEO_V4L2
        select RADIO_TEA575X
        help
          Choose Y here if you have one of these FM radio cards.
@@ -410,7 +402,6 @@ config RADIO_SF16FMR2
 config RADIO_TERRATEC
        tristate "TerraTec ActiveRadio ISA Standalone"
        depends on ISA || COMPILE_TEST
-       depends on VIDEO_V4L2
        select RADIO_ISA
        help
          Choose Y here if you have this FM radio card.
@@ -425,7 +416,6 @@ config RADIO_TERRATEC
 config RADIO_TRUST
        tristate "Trust FM radio card"
        depends on ISA || COMPILE_TEST
-       depends on VIDEO_V4L2
        select RADIO_ISA
        help
          This is a driver for the Trust FM radio cards. Say Y if you have
@@ -449,7 +439,6 @@ config RADIO_TRUST_PORT
 config RADIO_TYPHOON
        tristate "Typhoon Radio (a.k.a. EcoRadio)"
        depends on ISA || COMPILE_TEST
-       depends on VIDEO_V4L2
        select RADIO_ISA
        help
          Choose Y here if you have one of these FM radio cards, and then fill
@@ -484,7 +473,6 @@ config RADIO_TYPHOON_MUTEFREQ
 config RADIO_ZOLTRIX
        tristate "Zoltrix Radio"
        depends on ISA || COMPILE_TEST
-       depends on VIDEO_V4L2
        select RADIO_ISA
        help
          Choose Y here if you have one of these FM radio cards, and then fill