summaryrefslogtreecommitdiffstats
path: root/sound/pci/Kconfig
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-05-22 10:01:22 +0200
committerTakashi Iwai <tiwai@suse.de>2011-05-22 10:01:22 +0200
commitb759b3ac9aee3afb01c21b603970ebb200c8048e (patch)
tree8a7bc11819410c47d248a3fc27579190853179df /sound/pci/Kconfig
parente28fb9c603f321e0bb4c6c43d58b31de052d6de6 (diff)
parentf428c94c842343b8580751cf637794050ca12d77 (diff)
downloadlinux-b759b3ac9aee3afb01c21b603970ebb200c8048e.tar.gz
linux-b759b3ac9aee3afb01c21b603970ebb200c8048e.tar.bz2
linux-b759b3ac9aee3afb01c21b603970ebb200c8048e.zip
Merge branch 'topic/lola' into for-linus
Diffstat (limited to 'sound/pci/Kconfig')
-rw-r--r--sound/pci/Kconfig9
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