From: Randy Dunlap Date: Wed, 4 May 2011 16:53:10 +0000 (-0700) Subject: ALSA: lola - fix lola build X-Git-Tag: v3.0-rc1~347^2~3^2 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=f428c94c842343b8580751cf637794050ca12d77 ALSA: lola - fix lola build sound/pci/lola/Makefile was trying to build lola modules even when PCI and SND_LOLA were not enabled, causing build errors: ERROR: "snd_pcm_hw_constraint_step" [sound/pci/lola/snd-lola.ko] undefined! ERROR: "snd_pcm_period_elapsed" [sound/pci/lola/snd-lola.ko] undefined! ERROR: "snd_dma_alloc_pages" [sound/pci/lola/snd-lola.ko] undefined! ERROR: "snd_pcm_hw_constraint_integer" [sound/pci/lola/snd-lola.ko] undefined! ERROR: "snd_pcm_sgbuf_ops_page" [sound/pci/lola/snd-lola.ko] undefined! ERROR: "snd_pcm_set_ops" [sound/pci/lola/snd-lola.ko] undefined! ERROR: "snd_pcm_lib_free_pages" [sound/pci/lola/snd-lola.ko] undefined! ERROR: "snd_pcm_lib_ioctl" [sound/pci/lola/snd-lola.ko] undefined! ERROR: "snd_pcm_lib_malloc_pages" [sound/pci/lola/snd-lola.ko] undefined! ERROR: "snd_pcm_sgbuf_get_chunk_size" [sound/pci/lola/snd-lola.ko] undefined! ERROR: "snd_dma_free_pages" [sound/pci/lola/snd-lola.ko] undefined! ERROR: "snd_pcm_lib_preallocate_pages_for_all" [sound/pci/lola/snd-lola.ko] undefined! ERROR: "snd_pcm_new" [sound/pci/lola/snd-lola.ko] undefined! Fix the Makefile to build only when CONFIG_SND_LOLA is enabled. Signed-off-by: Randy Dunlap Signed-off-by: Takashi Iwai --- diff --git a/sound/pci/lola/Makefile b/sound/pci/lola/Makefile index 674715a84965..8178a2a59d00 100644 --- a/sound/pci/lola/Makefile +++ b/sound/pci/lola/Makefile @@ -1,3 +1,4 @@ snd-lola-y := lola.o lola_pcm.o lola_clock.o lola_mixer.o snd-lola-$(CONFIG_SND_DEBUG) += lola_proc.o -obj-m = snd-lola.o + +obj-$(CONFIG_SND_LOLA) += snd-lola.o