Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b759b3ac authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/lola' into for-linus

parents e28fb9c6 f428c94c

Documentation/sound/alsa/ALSA-Configuration.txt

+7 −0
Original line number Original line Diff line number Diff line
@@ -1230,6 +1230,13 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
    This module supports multiple cards.

    This module supports multiple cards.

    The driver requires the firmware loader support on kernel.

    The driver requires the firmware loader support on kernel.





  Module snd-lola

  ---------------



    Module for Digigram Lola PCI-e boards



    This module supports multiple cards.



  Module snd-lx6464es

  Module snd-lx6464es

  -------------------

  -------------------

sound/pci/Kconfig

+9 −0
Original line number Original line Diff line number Diff line
@@ -658,6 +658,15 @@ config SND_KORG1212 
	  To compile this driver as a module, choose M here: the module

	  To compile this driver as a module, choose M here: the module

	  will be called snd-korg1212.

	  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

config SND_LX6464ES

	tristate "Digigram LX6464ES"

	tristate "Digigram LX6464ES"

	select SND_PCM

	select SND_PCM

sound/pci/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -64,6 +64,7 @@ obj-$(CONFIG_SND) += \ 
	ca0106/ \

	ca0106/ \

	cs46xx/ \

	cs46xx/ \

	cs5535audio/ \

	cs5535audio/ \

	lola/ \

	lx6464es/ \

	lx6464es/ \

	echoaudio/ \

	echoaudio/ \

	emu10k1/ \

	emu10k1/ \

sound/pci/lola/Makefile

0 → 100644
+4 −0
Original line number Original line Diff line number Diff line 
snd-lola-y := lola.o lola_pcm.o lola_clock.o lola_mixer.o

snd-lola-$(CONFIG_SND_DEBUG) += lola_proc.o



obj-$(CONFIG_SND_LOLA) += snd-lola.o

sound/pci/lola/lola.c

0 → 100644
+791 −0

File added.

Preview size limit exceeded, changes collapsed.