vserver 1.9.5.x5

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

diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index 648bccd..d303c2e 100644 (file)
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -100,6 +100,16 @@ config SOUND_CS4281
          Picture and feature list at
          <http://www.pcbroker.com/crystal4281.html>.
 
+config SOUND_BCM_CS4297A
+       tristate "Crystal Sound CS4297a (for Swarm)"
+       depends on SOUND_PRIME!=n && SIBYTE_SWARM && SOUND
+       help
+         The BCM91250A has a Crystal CS4297a on synchronous serial
+         port B (in addition to the DB-9 serial port).  Say Y or M
+         here to enable the sound chip instead of the UART.  Also
+         note that CONFIG_KGDB should not be enabled at the same
+         time, since it also attempts to use this UART port.
+
 config SOUND_ES1370
        tristate "Ensoniq AudioPCI (ES1370)"
        depends on SOUND_PRIME!=n && SOUND && PCI && SOUND_GAMEPORT
@@ -127,8 +137,8 @@ config SOUND_ES1371
          <file:Documentation/sound/oss/es1371>.
 
 config SOUND_ESSSOLO1
-       tristate "ESS Technology Solo1"
-       depends on SOUND_PRIME!=n && SOUND && SOUND_GAMEPORT
+       tristate "ESS Technology Solo1" 
+       depends on SOUND_PRIME!=n && SOUND && SOUND_GAMEPORT && PCI
        help
          Say Y or M if you have a PCI sound card utilizing the ESS Technology
          Solo1 chip. To find out if your sound card uses a
@@ -139,7 +149,7 @@ config SOUND_ESSSOLO1
 
 config SOUND_MAESTRO
        tristate "ESS Maestro, Maestro2, Maestro2E driver"
-       depends on SOUND_PRIME!=n && SOUND
+       depends on SOUND_PRIME!=n && SOUND && PCI
        help
          Say Y or M if you have a sound system driven by ESS's Maestro line
          of PCI sound chips.  These include the Maestro 1, Maestro 2, and
@@ -162,7 +172,10 @@ config SOUND_ICH
 
 config SOUND_HARMONY
        tristate "PA Harmony audio driver"
-       depends on GSC_LASI && SOUND
+       depends on GSC_LASI && SOUND_PRIME!=n
+       help
+         Say 'Y' or 'M' to include support for Harmony soundchip
+         on HP 712, 715/new and many other GSC based machines.
 
 config SOUND_SONICVIBES
        tristate "S3 SonicVibes"
@@ -186,7 +199,14 @@ config SOUND_VWSND
 
 config SOUND_HAL2
        tristate "SGI HAL2 sound (EXPERIMENTAL)"
-       depends on SGI_IP22 && SOUND && EXPERIMENTAL
+       depends on SOUND_PRIME!=n && SOUND && 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.
+
+config SOUND_IT8172
+       tristate "IT8172G Sound"
+       depends on SOUND_PRIME!=n && (MIPS_ITE8172 || MIPS_IVR) && SOUND
 
 config SOUND_VRC5477
        tristate "NEC Vrc5477 AC97 sound"
@@ -196,6 +216,14 @@ config SOUND_VRC5477
          integrated, multi-function controller chip for MIPS CPUs.  Works
          with the AC97 codec.
 
+config SOUND_AU1000
+       tristate "Au1000 Sound"
+       depends on SOUND_PRIME!=n && (SOC_AU1000 || SOC_AU1100 || SOC_AU1500) && SOUND
+
+config SOUND_AU1550_AC97
+       tristate "Au1550 AC97 Sound"
+       depends on SOUND_PRIME!=n && SOC_AU1550 && SOUND
+
 config SOUND_TRIDENT
        tristate "Trident 4DWave DX/NX, SiS 7018 or ALi 5451 PCI Audio Core"
        depends on SOUND_PRIME!=n && SOUND && SOUND_GAMEPORT
@@ -417,7 +445,7 @@ config MSNDPIN_MPU_IRQ
        depends on MSNDPIN_NONPNP
        default "0"
        help
-         Iinterrupt request number for the Kurzweil daughterboard
+         Interrupt request number for the Kurzweil daughterboard
          synthesizer on MultiSound Pinnacle and Fiji sound cards.
 
 config MSNDPIN_IDE_IO0
@@ -1075,8 +1103,8 @@ config SOUND_RME96XX
        depends on SOUND_PRIME!=n && PCI
        help
          Say Y or M if you have a Hammerfall or Hammerfall light
-         multichannel card from RME. If you want to acess advanced
-         features of the card, read Documentation/sound/oss/rme96xx.
+         multichannel card from RME. If you want to access advanced
+         features of the card, read <file:Documentation/sound/oss/rme96xx>.
 
 config SOUND_AD1980
        tristate "AD1980 front/back switch plugin"