diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-05-22 10:01:22 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-05-22 10:01:22 +0200 |
commit | b759b3ac9aee3afb01c21b603970ebb200c8048e (patch) | |
tree | 8a7bc11819410c47d248a3fc27579190853179df /sound/pci/Kconfig | |
parent | SOUND: OSS: Remove Au1550 driver. (diff) | |
parent | ALSA: lola - fix lola build (diff) | |
download | linux-b759b3ac9aee3afb01c21b603970ebb200c8048e.tar.xz linux-b759b3ac9aee3afb01c21b603970ebb200c8048e.zip |
Merge branch 'topic/lola' into for-linus
Diffstat (limited to 'sound/pci/Kconfig')
-rw-r--r-- | sound/pci/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index 389cd7931668..8d2856fb4d97 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig @@ -658,6 +658,15 @@ config SND_KORG1212 To compile this driver as a module, choose M here: the module will be called snd-korg1212. +config SND_LOLA + tristate "Digigram Lola" + select SND_PCM + help + Say Y to include support for Digigram Lola boards. + + To compile this driver as a module, choose M here: the module + will be called snd-lola. + config SND_LX6464ES tristate "Digigram LX6464ES" select SND_PCM |