Merge branch 'linus' into x86/irq

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

diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index af37cd09bdddc58f1d09424df5338fd5b68784f1..3be2dc1025b50592ef29f61e5480e4431a6de103 100644 (file)
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -75,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).
@@ -143,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
@@ -564,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.