From: Al Viro <viro@ftp.linux.org.uk>
Date: Wed, 21 May 2008 05:32:11 +0000 (+0100)
Subject: msnd_* is ISA-only
X-Git-Tag: v2.6.26-rc4~76
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e3428e2cf83ca47b66c194559b9e8a74af915947;p=linux-2.6-omap-h63xx.git

msnd_* is ISA-only

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index 857008bb716..3be2dc1025b 100644
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -79,7 +79,7 @@ config SOUND_TRIDENT
 
 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