diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-05-22 10:01:29 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-05-22 10:01:29 +0200 |
commit | 02e5fbf622aabf68bdc02282a17a3aeed054237a (patch) | |
tree | 60f2d4e09464dbf338c832bb39f861f29779b86b /drivers/media/radio/Kconfig | |
parent | b759b3ac9aee3afb01c21b603970ebb200c8048e (diff) | |
parent | bfe9fc8aebc997ce8bcf8ac0586c84a247812064 (diff) | |
download | kernel_samsung_smdk4412-02e5fbf622aabf68bdc02282a17a3aeed054237a.zip kernel_samsung_smdk4412-02e5fbf622aabf68bdc02282a17a3aeed054237a.tar.gz kernel_samsung_smdk4412-02e5fbf622aabf68bdc02282a17a3aeed054237a.tar.bz2 |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'drivers/media/radio/Kconfig')
-rw-r--r-- | drivers/media/radio/Kconfig | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig index 299994c..e4c97fd 100644 --- 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 |