Merge branch 'for-jeff' of git://htj.dyndns.org/libata-tj into tejun-merge

[linux-2.6] / sound / oss / Kconfig

diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index f1ed710..558c6ed 100644 (file)
--- 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
@@ -458,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