Merge branch 'fix/misc' into topic/misc

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

diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index 299994c3aa74a01b7d9de6ef60fda37f6d1e0af5..e4c97fd6f05a329db01408effae324c4f2ef3d42 100644 (file)
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -166,21 +166,6 @@ config RADIO_MAXIRADIO
          To compile this driver as a module, choose M here: the
          module will be called radio-maxiradio.
 
-config RADIO_MAESTRO
-       tristate "Maestro on board radio"
-       depends on VIDEO_V4L2 && PCI
-       ---help---
-         Say Y here to directly support the on-board radio tuner on the
-         Maestro 2 or 2E sound card.
-
-         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-maestro.
-
 config RADIO_MIROPCM20
        tristate "miroSOUND PCM20 radio"
        depends on ISA && VIDEO_V4L2 && SND