Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6] / sound / oss / Kconfig

diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index 866d4de8d4ab9b9486d4d2cd1ae3e164cf9af201..3be2dc1025b50592ef29f61e5480e4431a6de103 100644 (file)
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -31,14 +31,6 @@ config SOUND_HAL2
          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_VRC5477
-       tristate "NEC Vrc5477 AC97 sound"
-       depends on SOUND_PRIME && DDB5477
-       help
-         Say Y here to enable sound support for the NEC Vrc5477 chip, an
-         integrated, multi-function controller chip for MIPS CPUs.  Works
-         with the AC97 codec.
-
 config SOUND_AU1550_AC97
        tristate "Au1550/Au1200 AC97 Sound"
        select SND_AC97_CODEC
@@ -83,11 +75,11 @@ config SOUND_TRIDENT
 
 
          This driver differs slightly from OSS/Free, so PLEASE READ the
-         comments at the top of <file:drivers/sound/trident.c>.
+         comments at the top of <file:sound/oss/trident.c>.
 
 config SOUND_MSNDCLAS
        tristate "Support for Turtle Beach MultiSound Classic, Tahiti, Monterey"
-       depends on SOUND_PRIME && (m || !STANDALONE)
+       depends on SOUND_PRIME && (m || !STANDALONE) && ISA
        help
          Say M here if you have a Turtle Beach MultiSound Classic, Tahiti or
          Monterey (not for the Pinnacle or Fiji).
@@ -151,7 +143,7 @@ config MSNDCLAS_IO
 
 config SOUND_MSNDPIN
        tristate "Support for Turtle Beach MultiSound Pinnacle, Fiji"
-       depends on SOUND_PRIME && (m || !STANDALONE)
+       depends on SOUND_PRIME && (m || !STANDALONE) && ISA
        help
          Say M here if you have a Turtle Beach MultiSound Pinnacle or Fiji.
          See <file:Documentation/sound/oss/MultiSound> for important information
@@ -572,7 +564,7 @@ config SOUND_AEDSP16
          questions.
 
          Read the <file:Documentation/sound/oss/README.OSS> file and the head of
-         <file:drivers/sound/aedsp16.c> as well as
+         <file:sound/oss/aedsp16.c> as well as
          <file:Documentation/sound/oss/AudioExcelDSP16> to get more information
          about this driver and its configuration.