aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-04-27 21:39:21 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-28 11:33:46 -0400
commit1d3d1d3e0356b583b642b016f874e2d1bd578453 (patch)
treecf58f8dcb4d028ddb6c0fca250d5cdaaaf14c989
parentd698f1c72629ff43d0cb6b9f1d17c491c057a0d9 (diff)
[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>
-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
478 478
479 This driver is also available as a module and will be called aci. 479 This driver is also available as a module and will be called aci.
480 480
481config SOUND_CS4232
482 tristate "Crystal CS4232 based (PnP) cards"
483 depends on SOUND_OSS
484 help
485 Say Y here if you have a card based on the Crystal CS4232 chip set,
486 which uses its own Plug and Play protocol.
487
488 If you compile the driver into the kernel, you have to add
489 "cs4232=<io>,<irq>,<dma>,<dma2>,<mpuio>,<mpuirq>" to the kernel
490 command line.
491
492 See <file:Documentation/sound/oss/CS4232> for more information on
493 configuring this card.
494
481config SOUND_VMIDI 495config SOUND_VMIDI
482 tristate "Loopback MIDI device support" 496 tristate "Loopback MIDI device support"
483 depends on SOUND_OSS 497 depends on SOUND_OSS