Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6

[linux-2.6] / drivers / media / radio / Kconfig

diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index 79d6b1bcd1a4a572d170f4df4cad0dc58302bb4d..6d96b17a7f818b018daacf163f8c8c38dbc26310 100644 (file)
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -7,7 +7,7 @@ menu "Radio Adapters"
 
 config RADIO_CADET
        tristate "ADS Cadet AM/FM Tuner"
-       depends on ISA && VIDEO_V4L1
+       depends on ISA && VIDEO_V4L2
        ---help---
          Choose Y here if you have one of these AM/FM radio cards, and then
          fill in the port address below.
@@ -145,7 +145,7 @@ config RADIO_GEMTEK_PCI
 
 config RADIO_MAXIRADIO
        tristate "Guillemot MAXI Radio FM 2000 radio"
-       depends on VIDEO_V4L1 && PCI
+       depends on VIDEO_V4L2 && PCI
        ---help---
          Choose Y here if you have this radio card.  This card may also be
          found as Gemtek PCI FM.
@@ -195,8 +195,7 @@ config RADIO_MIROPCM20_RDS
        ---help---
          Choose Y here if you want to see RDS/RBDS information like
          RadioText, Programme Service name, Clock Time and date, Programme
-         TYpe and Traffic Announcement/Programme identification.  You also
-         need to say Y to "miroSOUND PCM20 radio" and devfs!
+         Type and Traffic Announcement/Programme identification.
 
          It's not possible to read the raw RDS packets from the device, so
          the driver cant provide an V4L interface for this.  But the
@@ -268,7 +267,7 @@ config RADIO_TERRATEC_PORT
 
 config RADIO_TRUST
        tristate "Trust FM radio card"
-       depends on ISA && VIDEO_V4L1
+       depends on ISA && VIDEO_V4L2
        help
          This is a driver for the Trust FM radio cards. Say Y if you have
          such a card and want to use it under Linux.
@@ -286,7 +285,7 @@ config RADIO_TRUST_PORT
 
 config RADIO_TYPHOON
        tristate "Typhoon Radio (a.k.a. EcoRadio)"
-       depends on ISA && VIDEO_V4L1
+       depends on ISA && VIDEO_V4L2
        ---help---
          Choose Y here if you have one of these FM radio cards, and then fill
          in the port address and the frequency used for muting below.
@@ -330,7 +329,7 @@ config RADIO_TYPHOON_MUTEFREQ
 
 config RADIO_ZOLTRIX
        tristate "Zoltrix Radio"
-       depends on ISA && VIDEO_V4L1
+       depends on ISA && VIDEO_V4L2
        ---help---
          Choose Y here if you have one of these FM radio cards, and then fill
          in the port address below.
@@ -352,7 +351,7 @@ config RADIO_ZOLTRIX_PORT
 
 config USB_DSBR
        tristate "D-Link USB FM radio support (EXPERIMENTAL)"
-       depends on USB && VIDEO_V4L1 && EXPERIMENTAL
+       depends on USB && VIDEO_V4L2 && EXPERIMENTAL
        ---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