diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-12 14:16:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-12 14:16:27 -0400 |
| commit | e349792a385ed47390d156155b1a1e19af1bf163 (patch) | |
| tree | f9dc4e3e42769950230eaa58ecdd056eb27b23e8 /sound/isa/Kconfig | |
| parent | 6d21491838a2a9f22843c7530b118596ee9f4d77 (diff) | |
| parent | e3f86d3d3ce350144562d9bd035dc8a274fce58e (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: (290 commits)
ALSA: pcm - Update document about xrun_debug proc file
ALSA: lx6464es - support standard alsa module parameters
ALSA: snd_usb_caiaq: set mixername
ALSA: hda - add quirk for STAC92xx (SigmaTel STAC9205)
ALSA: use card device as parent for jack input-devices
ALSA: sound/ps3: Correct existing and add missing annotations
ALSA: sound/ps3: Restructure driver source
ALSA: sound/ps3: Fix checkpatch issues
ASoC: Fix lm4857 control
ALSA: ctxfi - Clear PCM resources at hw_params and hw_free
ALSA: ctxfi - Check the presence of SRC instance in PCM pointer callbacks
ALSA: ctxfi - Add missing start check in atc_pcm_playback_start()
ALSA: ctxfi - Add use_system_timer module option
ALSA: usb - Add boot quirk for C-Media 6206 USB Audio
ALSA: ctxfi - Fix wrong model id for UAA
ALSA: ctxfi - Clean up probe routines
ALSA: hda - Fix the previous tagra-8ch patch
ALSA: hda - Add 7.1 support for MSI GX620
ALSA: pcm - A helper function to compose PCM stream name for debug prints
ALSA: emu10k1 - Fix minimum periods for efx playback
...
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 c6942a4de99b..51a7e3777e17 100644 --- a/sound/isa/Kconfig +++ b/sound/isa/Kconfig | |||
| @@ -177,15 +177,18 @@ config SND_ES18XX | |||
| 177 | will be called snd-es18xx. | 177 | will be called snd-es18xx. |
| 178 | 178 | ||
| 179 | config SND_SC6000 | 179 | config SND_SC6000 |
| 180 | tristate "Gallant SC-6000, Audio Excel DSP 16" | 180 | tristate "Gallant SC-6000/6600/7000 and Audio Excel DSP 16" |
| 181 | depends on HAS_IOPORT | 181 | depends on HAS_IOPORT |
| 182 | select SND_WSS_LIB | 182 | select SND_WSS_LIB |
| 183 | select SND_OPL3_LIB | 183 | select SND_OPL3_LIB |
| 184 | select SND_MPU401_UART | 184 | select SND_MPU401_UART |
| 185 | help | 185 | help |
| 186 | Say Y here to include support for Gallant SC-6000 card and clones: | 186 | Say Y here to include support for Gallant SC-6000, SC-6600, SC-7000 |
| 187 | cards and clones: | ||
| 187 | Audio Excel DSP 16 and Zoltrix AV302. | 188 | Audio Excel DSP 16 and Zoltrix AV302. |
| 188 | 189 | ||
| 190 | These cards are based on CompuMedia ASC-9308 or ASC-9408 chips. | ||
| 191 | |||
| 189 | To compile this driver as a module, choose M here: the module | 192 | To compile this driver as a module, choose M here: the module |
| 190 | will be called snd-sc6000. | 193 | will be called snd-sc6000. |
| 191 | 194 | ||