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

[~andy/linux] / drivers / media / radio / Kconfig

diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index 9e580166161a2cbd2a15cad9b4bc74b17e72103b..24e64a09884cb8858c713bdc373cdd593840b855 100644 (file)
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -124,6 +124,18 @@ config USB_KEENE
          To compile this driver as a module, choose M here: the
          module will be called radio-keene.
 
+config USB_MA901
+       tristate "Masterkit MA901 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 or headphones.
+
+         To compile this driver as a module, choose M here: the
+         module will be called radio-ma901.
+
 config RADIO_TEA5764
        tristate "TEA5764 I2C FM radio support"
        depends on I2C && VIDEO_V4L2