aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-04-20 02:43:22 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-20 07:54:04 -0700
commit46539264df5b1fcdc2cad585b032a86661fe079d (patch)
tree6820721cb8d523927a4e56a6498ff8deac095702
parentaafda4e0d0424180023e16f43785f9344ea35719 (diff)
downloadkernel_samsung_smdk4412-46539264df5b1fcdc2cad585b032a86661fe079d.zip
kernel_samsung_smdk4412-46539264df5b1fcdc2cad585b032a86661fe079d.tar.gz
kernel_samsung_smdk4412-46539264df5b1fcdc2cad585b032a86661fe079d.tar.bz2
[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>
-rw-r--r--sound/oss/Kconfig20
1 files changed, 20 insertions, 0 deletions
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index f1ed710..6275266 100644
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -383,6 +383,26 @@ config MSND_FIFOSIZE
and Pinnacle). Larger values reduce the chance of data overruns at
the expense of overall latency. If unsure, use the default.
+config SOUND_VIA82CXXX
+ tristate "VIA 82C686 Audio Codec"
+ depends on SOUND_PRIME && PCI
+ help
+ Say Y here to include support for the audio codec found on VIA
+ 82Cxxx-based chips. Typically these are built into a motherboard.
+
+ DO NOT select Sound Blaster or Adlib with this driver, unless
+ you have a Sound Blaster or Adlib card in addition to your VIA
+ audio chip.
+
+config MIDI_VIA82CXXX
+ bool "VIA 82C686 MIDI"
+ depends on SOUND_VIA82CXXX && ISA_DMA_API
+ help
+ Answer Y to use the MIDI interface of the Via686. You may need to
+ enable this in the BIOS before it will work. This is for connection
+ to external MIDI hardware, and is not required for software playback
+ of MIDI files.
+
config SOUND_OSS
tristate "OSS sound modules"
depends on SOUND_PRIME && ISA_DMA_API