Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[mv-sheeva.git] / drivers / media / radio / Kconfig

diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index a87a477c87f2d01a4d475a15f2d2ecafd9ecc6a4..d4389963b3120c6560427f01d313b056cccee58b 100644 (file)
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -195,6 +195,24 @@ config RADIO_MAESTRO
          To compile this driver as a module, choose M here: the
          module will be called radio-maestro.
 
+config RADIO_MIROPCM20
+       tristate "miroSOUND PCM20 radio"
+       depends on ISA && VIDEO_V4L2
+       select SND_MIRO
+       ---help---
+         Choose Y here if you have this FM radio card. You also need to enable
+         the ALSA sound system. This choice automatically selects the ALSA
+         sound card driver "Miro miroSOUND PCM1pro/PCM12/PCM20radio" as this
+         is required for the radio-miropcm20.
+
+         In order to control your radio card, you will need to use programs
+         that are compatible with the Video For Linux API.  Information on
+         this API and pointers to "v4l" programs may be found at
+         <file:Documentation/video4linux/API.html>.
+
+         To compile this driver as a module, choose M here: the
+         module will be called radio-miropcm20.
+
 config RADIO_SF16FMI
        tristate "SF16FMI Radio"
        depends on ISA && VIDEO_V4L2
@@ -401,4 +419,16 @@ config RADIO_TEA5764_XTAL
          Say Y here if TEA5764 have a 32768 Hz crystal in circuit, say N
          here if TEA5764 reference frequency is connected in FREQIN.
 
+config RADIO_TEF6862
+       tristate "TEF6862 Car Radio Enhanced Selectivity Tuner"
+       depends on I2C && VIDEO_V4L2
+       ---help---
+         Say Y here if you want to use the TEF6862 Car Radio Enhanced
+         Selectivity Tuner, found for instance on the Russellville development
+         board. On the russellville the device is connected to internal
+         timberdale I2C bus.
+
+         To compile this driver as a module, choose M here: the
+         module will be called TEF6862.
+
 endif # RADIO_ADAPTERS