diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 19:52:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 19:52:13 -0800 |
| commit | 78f1ae193d1662c22cfebb916e788e1ca896c0fe (patch) | |
| tree | 0cca2c3d68c8ea48786cd3e9912f822fee7d1e17 /drivers | |
| parent | fa395aaec823b9d1a5800913a6b5d0e6d1c5ced2 (diff) | |
| parent | 84194883bcf89383ea4230116bb0195af5ec5829 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: ice1724 - aureon - modify WM8770 Master & DAC volume
ALSA: hda/realtek: quirk for D945GCLF2 mainboard
ALSA: hda - Terradici HDA controllers does not support 64-bit mode
ALSA: document: Add direct git link to grub hda-analyzer
ALSA: radio/sound/miro: fix build, cleanup depends/selects
ALSA: hda - Generalize EAPD inversion check in patch_analog.c
ASoC: Wrong variable returned on error
ALSA: snd-usb-us122l: add product IDs of US-122MKII and US-144MKII
ALSA: hda - Exclude unusable ADCs for ALC88x
ALSA: hda - Add missing Line-Out and PCM switches as slave
ALSA: hda - iMac 9,1 sound patch.
ALSA: opti93x: set MC indirect registers base from PnP data
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/radio/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig index d4389963b31..4c2b8a24677 100644 --- a/drivers/media/radio/Kconfig +++ b/drivers/media/radio/Kconfig @@ -197,7 +197,8 @@ config RADIO_MAESTRO config RADIO_MIROPCM20 tristate "miroSOUND PCM20 radio" - depends on ISA && VIDEO_V4L2 + depends on ISA && VIDEO_V4L2 && SND + select SND_ISA select SND_MIRO ---help--- Choose Y here if you have this FM radio card. You also need to enable |