diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-06-14 21:22:15 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-06-14 21:22:15 +0900 |
commit | bff7b55bdb325f62c4e30a97883ebd2b536bd47b (patch) | |
tree | de4ab64ec0837ae308e17312b553e9a5209b6f62 /sound/isa/Kconfig | |
parent | e7fad451f06e21e74b6051c5ad4917e37460be3a (diff) | |
parent | 44b7532b8b464f606053562400719c9c21276037 (diff) | |
download | op-kernel-dev-bff7b55bdb325f62c4e30a97883ebd2b536bd47b.zip op-kernel-dev-bff7b55bdb325f62c4e30a97883ebd2b536bd47b.tar.gz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'sound/isa/Kconfig')
-rw-r--r-- | sound/isa/Kconfig | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig index c6942a4..51a7e37 100644 --- a/sound/isa/Kconfig +++ b/sound/isa/Kconfig @@ -177,15 +177,18 @@ config SND_ES18XX will be called snd-es18xx. config SND_SC6000 - tristate "Gallant SC-6000, Audio Excel DSP 16" + tristate "Gallant SC-6000/6600/7000 and Audio Excel DSP 16" depends on HAS_IOPORT select SND_WSS_LIB select SND_OPL3_LIB select SND_MPU401_UART help - Say Y here to include support for Gallant SC-6000 card and clones: + Say Y here to include support for Gallant SC-6000, SC-6600, SC-7000 + cards and clones: Audio Excel DSP 16 and Zoltrix AV302. + These cards are based on CompuMedia ASC-9308 or ASC-9408 chips. + To compile this driver as a module, choose M here: the module will be called snd-sc6000. |