Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / media / radio / Kconfig

diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index de6ca277dabf143a0f790799813ff1a56d5e6c3a..41e1ae8671a431bfd440ab25b73ad0c20d0342fe 100644 (file)
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -372,6 +372,18 @@ config USB_SI470X
          computer's USB port.
 
          To compile this driver as a module, choose M here: the
-         module will be called radio-silabs.
+         module will be called radio-si470x.
+
+config USB_MR800
+       tristate "AverMedia MR 800 USB FM radio support"
+       depends on USB && VIDEO_V4L2
+       ---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
+         you must connect the line out connector to a sound card or a
+         set of speakers.
+
+         To compile this driver as a module, choose M here: the
+         module will be called radio-mr800.
 
 endif # RADIO_ADAPTERS