diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:36:21 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:36:21 +0100 |
| commit | d0807323345f1cd8ab578b09aab04d10862e9414 (patch) | |
| tree | 0a1cca9055d4534590779f014199116c7c802d57 /sound/isa/Kconfig | |
| parent | d7b6df5d1af11544401ca051aaf68b6e7f110c0e (diff) | |
| parent | 453e37b37521b613f0927fcf53ccd93ad3a8b3ae (diff) | |
| download | linux-d0807323345f1cd8ab578b09aab04d10862e9414.tar.gz linux-d0807323345f1cd8ab578b09aab04d10862e9414.tar.bz2 linux-d0807323345f1cd8ab578b09aab04d10862e9414.zip | |
Merge branch 'topic/sscape-fix' into for-linus
Diffstat (limited to 'sound/isa/Kconfig')
| -rw-r--r-- | sound/isa/Kconfig | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig index 2df20e403f24..c5c9a9218ff6 100644 --- 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. |