diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-23 10:58:33 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-23 10:58:33 -0700 |
commit | dee6515b6d12188f4b9bbe76613371f7840a8a53 (patch) | |
tree | 3acf4736ff5204871e194f3d2988efa75e136cb8 /sound/isa/Kconfig | |
parent | 73441c665bee555526b1cf3eef603a0cff0b7e19 (diff) | |
parent | 68e7fffc0f3e95063ba5bd94ee6f9b8927247297 (diff) | |
download | linux-stable-dee6515b6d12188f4b9bbe76613371f7840a8a53.tar.gz linux-stable-dee6515b6d12188f4b9bbe76613371f7840a8a53.tar.bz2 linux-stable-dee6515b6d12188f4b9bbe76613371f7840a8a53.zip |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa:
[ALSA] hda-intel - Add check of MSI availabity
[ALSA] version 1.0.13
[ALSA] Fix addition of user-defined boolean controls
[ALSA] Fix AC97 power-saving mode
[ALSA] Fix re-use of va_list
[ALSA] hda_intel: add ATI RS690 HDMI audio support
[ALSA] hda-codec - Add model entry for ASUS U5F laptop
[ALSA] Fix dependency of snd-adlib driver in Kconfig
[ALSA] Various fixes for suspend/resume of ALSA PCI drivers
[ALSA] hda-codec - Fix assignment of PCM devices for Realtek codecs
[ALSA] sound/isa/opti9xx/opti92x-ad1848.c: check kmalloc() return value
[ALSA] sound/isa/ad1816a/ad1816a.c: check kmalloc() return value
[ALSA] sound/isa/cmi8330.c: check kmalloc() return value
[ALSA] sound/isa/gus/interwave.c: check kmalloc() return value
Diffstat (limited to 'sound/isa/Kconfig')
-rw-r--r-- | sound/isa/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig index 557c4de22960..57371f1a441f 100644 --- a/sound/isa/Kconfig +++ b/sound/isa/Kconfig @@ -13,6 +13,7 @@ config SND_CS4231_LIB config SND_ADLIB tristate "AdLib FM card" + depends on SND select SND_OPL3_LIB help Say Y here to include support for AdLib FM cards. |