Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755129Ab1EDRyg (ORCPT ); Wed, 4 May 2011 13:54:36 -0400 Received: from cantor.suse.de ([195.135.220.2]:46314 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754900Ab1EDRyf (ORCPT ); Wed, 4 May 2011 13:54:35 -0400 Date: Wed, 04 May 2011 19:54:33 +0200 Message-ID: From: Takashi Iwai To: Randy Dunlap Cc: Stephen Rothwell , linux-next@vger.kernel.org, LKML Subject: Re: [PATCH -next] sound: fix lola build In-Reply-To: <20110504095310.465fae53.randy.dunlap@oracle.com> References: <20110504144759.802483cc.sfr@canb.auug.org.au> <20110504095310.465fae53.randy.dunlap@oracle.com> User-Agent: Wanderlust/2.15.6 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.7 Emacs/23.2 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2092 Lines: 49 At Wed, 4 May 2011 09:53:10 -0700, Randy Dunlap wrote: > > From: Randy Dunlap > > 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. Gah, this was taken over from the devel branch and I forgot to fix at the merge time. Thanks for noticing. Takashi > Signed-off-by: Randy Dunlap > --- > sound/pci/lola/Makefile | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > --- linux-next-20110504.orig/sound/pci/lola/Makefile > +++ linux-next-20110504/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 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/