diff --git a/[refs] b/[refs] index 0bc40d29c781..3193ef255414 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c9864fd30a28aceef5293f28559c4a2f5a20d7d5 +refs/heads/master: 56305757f0b64b7d5dd02fd54c6dfc0989868f31 diff --git a/trunk/sound/isa/Kconfig b/trunk/sound/isa/Kconfig index ce0aa044e274..542c1ead14bd 100644 --- a/trunk/sound/isa/Kconfig +++ b/trunk/sound/isa/Kconfig @@ -377,14 +377,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.