Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / sound / oss / Kconfig

diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index 6275266dde2e754104badf084ce20003596a0d36..3b8cdbca263665e53eca3f06b96c353912f6a218 100644 (file)
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -98,8 +98,8 @@ config SOUND_HAL2
        tristate "SGI HAL2 sound (EXPERIMENTAL)"
        depends on SOUND_PRIME && SGI_IP22 && EXPERIMENTAL
        help
-         Say Y or M if you have an SGI Indy system and want to be able to
-         use it's on-board A2 audio system.
+         Say Y or M if you have an SGI Indy or Indigo2 system and want to be able to
+         use its on-board A2 audio system.
 
 config SOUND_IT8172
        tristate "IT8172G Sound"
@@ -114,8 +114,9 @@ config SOUND_VRC5477
          with the AC97 codec.
 
 config SOUND_AU1550_AC97
-       tristate "Au1550 AC97 Sound"
-       depends on SOUND_PRIME && SOC_AU1550
+       tristate "Au1550/Au1200 AC97 Sound"
+       select SND_AC97_CODEC
+       depends on SOUND_PRIME && (SOC_AU1550 || SOC_AU1200)
 
 config SOUND_TRIDENT
        tristate "Trident 4DWave DX/NX, SiS 7018 or ALi 5451 PCI Audio Core"
@@ -478,6 +479,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
@@ -824,6 +839,6 @@ config SOUND_SH_DAC_AUDIO
        depends on SOUND_PRIME && CPU_SH3
 
 config SOUND_SH_DAC_AUDIO_CHANNEL
-       int "    DAC channel"
+       int "DAC channel"
        default "1"
        depends on SOUND_SH_DAC_AUDIO