summaryrefslogtreecommitdiffstats
path: root/sound/oss
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-04-28 03:39:21 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-28 17:33:46 +0200
commit1d3d1d3e0356b583b642b016f874e2d1bd578453 (patch)
treecf58f8dcb4d028ddb6c0fca250d5cdaaaf14c989 /sound/oss
parent[PATCH] fix array overrun in drivers/char/mwave/mwavedd.c (diff)
downloadlinux-1d3d1d3e0356b583b642b016f874e2d1bd578453.tar.xz
linux-1d3d1d3e0356b583b642b016f874e2d1bd578453.zip
[PATCH] re-add the OSS SOUND_CS4232 option
A regression in the ALSA driver compared to the OSS driver was reported as ALSA bug #1520, so let's keep the OSS driver for now. 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/oss')
-rw-r--r--sound/oss/Kconfig14
1 files changed, 14 insertions, 0 deletions
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index 6275266dde2e..558c6ed443be 100644
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -478,6 +478,20 @@ config SOUND_ACI_MIXER
This driver is also available as a module and will be called aci.
+config SOUND_CS4232
+ tristate "Crystal CS4232 based (PnP) cards"
+ depends on SOUND_OSS
+ help
+ Say Y here if you have a card based on the Crystal CS4232 chip set,
+ which uses its own Plug and Play protocol.
+
+ If you compile the driver into the kernel, you have to add
+ "cs4232=<io>,<irq>,<dma>,<dma2>,<mpuio>,<mpuirq>" to the kernel
+ command line.
+
+ See <file:Documentation/sound/oss/CS4232> for more information on
+ configuring this card.
+
config SOUND_VMIDI
tristate "Loopback MIDI device support"
depends on SOUND_OSS