Merge branch 'topic/lola' into for-linus

This commit is contained in:
Takashi Iwai
2011-05-22 10:01:22 +02:00
10 changed files with 3429 additions and 0 deletions

View File

@@ -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