aboutsummaryrefslogtreecommitdiff
path: root/sound/isa/Kconfig
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-06-10 07:26:45 +0200
committerTakashi Iwai <tiwai@suse.de>2009-06-10 07:26:45 +0200
commit45d60e3648eaba1f5f6976df901fb7c45660fb49 (patch)
treefb468f9c69a650989590dd6b5c6563fc796403e9 /sound/isa/Kconfig
parent87cb14a5f46207f5c445dd755096f8568d136a2a (diff)
parentb0ec3a30bc01c15cc6277b223fae136f7b71e90c (diff)
downloadlinux-stericsson-45d60e3648eaba1f5f6976df901fb7c45660fb49.tar.gz
Merge branch 'topic/sc6000' into for-linus
* topic/sc6000: ALSA: sc6000: enable joystick port ALSA: sc6000: fix older card initialization ALSA: sc6000: add support for SC-6600 and SC-7000
Diffstat (limited to 'sound/isa/Kconfig')
-rw-r--r--sound/isa/Kconfig7
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index c6942a4de99b..51a7e3777e17 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.