vserver 1.9.3

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

diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index 648bccd..46022a5 100644 (file)
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -127,8 +127,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 +139,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 +162,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 +189,10 @@ 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_VRC5477
        tristate "NEC Vrc5477 AC97 sound"