Merge branch 'topic/sscape-fix' into for-linus

git-mirror · Mar 23, 2009 · d080732 · d080732
2 parents d7b6df5 + 453e37b
commit d080732
Show file tree

Hide file tree

Showing 3 changed files with 96 additions and 181 deletions.
diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
@@ -368,14 +368,17 @@ config SND_SGALAXY
 	  will be called snd-sgalaxy.
 
 config SND_SSCAPE
-	tristate "Ensoniq SoundScape PnP driver"
+	tristate "Ensoniq SoundScape driver"
 	select SND_HWDEP
 	select SND_MPU401_UART
 	select SND_WSS_LIB
 	help
-	  Say Y here to include support for Ensoniq SoundScape PnP
+	  Say Y here to include support for Ensoniq SoundScape 
 	  soundcards.
 
+	  The PCM audio is supported on SoundScape Classic, Elite, PnP
+	  and VIVO cards. The MIDI support is very experimental.
+
 	  To compile this driver as a module, choose M here: the module
 	  will be called snd-sscape.