aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-04-20 05:43:22 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-20 10:54:04 -0400
commit46539264df5b1fcdc2cad585b032a86661fe079d (patch)
tree6820721cb8d523927a4e56a6498ff8deac095702 /sound
parentaafda4e0d0424180023e16f43785f9344ea35719 (diff)
[PATCH] make the OSS SOUND_VIA82CXXX option available again
There was a report of a regression in the ALSA driver for the same hardware. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/oss/Kconfig20
1 files changed, 20 insertions, 0 deletions
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index f1ed710a18d7..6275266dde2e 100644
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -383,6 +383,26 @@ config MSND_FIFOSIZE
383 and Pinnacle). Larger values reduce the chance of data overruns at 383 and Pinnacle). Larger values reduce the chance of data overruns at
384 the expense of overall latency. If unsure, use the default. 384 the expense of overall latency. If unsure, use the default.
385 385
386config SOUND_VIA82CXXX
387 tristate "VIA 82C686 Audio Codec"
388 depends on SOUND_PRIME && PCI
389 help
390 Say Y here to include support for the audio codec found on VIA
391 82Cxxx-based chips. Typically these are built into a motherboard.
392
393 DO NOT select Sound Blaster or Adlib with this driver, unless
394 you have a Sound Blaster or Adlib card in addition to your VIA
395 audio chip.
396
397config MIDI_VIA82CXXX
398 bool "VIA 82C686 MIDI"
399 depends on SOUND_VIA82CXXX && ISA_DMA_API
400 help
401 Answer Y to use the MIDI interface of the Via686. You may need to
402 enable this in the BIOS before it will work. This is for connection
403 to external MIDI hardware, and is not required for software playback
404 of MIDI files.
405
386config SOUND_OSS 406config SOUND_OSS
387 tristate "OSS sound modules" 407 tristate "OSS sound modules"
388 depends on SOUND_PRIME && ISA_DMA_API 408 depends on SOUND_PRIME && ISA_DMA_API