diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-05-22 04:01:22 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-05-22 04:01:22 -0400 |
commit | b759b3ac9aee3afb01c21b603970ebb200c8048e (patch) | |
tree | 8a7bc11819410c47d248a3fc27579190853179df /sound/pci/Kconfig | |
parent | e28fb9c603f321e0bb4c6c43d58b31de052d6de6 (diff) | |
parent | f428c94c842343b8580751cf637794050ca12d77 (diff) |
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 389cd793166..8d2856fb4d9 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig | |||
@@ -658,6 +658,15 @@ config SND_KORG1212 | |||
658 | To compile this driver as a module, choose M here: the module | 658 | To compile this driver as a module, choose M here: the module |
659 | will be called snd-korg1212. | 659 | will be called snd-korg1212. |
660 | 660 | ||
661 | config SND_LOLA | ||
662 | tristate "Digigram Lola" | ||
663 | select SND_PCM | ||
664 | help | ||
665 | Say Y to include support for Digigram Lola boards. | ||
666 | |||
667 | To compile this driver as a module, choose M here: the module | ||
668 | will be called snd-lola. | ||
669 | |||
661 | config SND_LX6464ES | 670 | config SND_LX6464ES |
662 | tristate "Digigram LX6464ES" | 671 | tristate "Digigram LX6464ES" |
663 | select SND_PCM | 672 | select SND_PCM |