From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964942AbWFZLL3 (ORCPT ); Mon, 26 Jun 2006 07:11:29 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S964994AbWFZLL2 (ORCPT ); Mon, 26 Jun 2006 07:11:28 -0400 Received: from cantor.suse.de ([195.135.220.2]:32693 "EHLO mx1.suse.de") by vger.kernel.org with ESMTP id S964942AbWFZLL2 (ORCPT ); Mon, 26 Jun 2006 07:11:28 -0400 Date: Mon, 26 Jun 2006 13:11:26 +0200 Message-ID: From: Takashi Iwai To: Johannes Berg Cc: ALSA development , Linux Kernel list Subject: Re: [PATCH] fix build failure due to snd-aoa In-Reply-To: <1151303134.7608.86.camel@localhost> References: <1151303134.7608.86.camel@localhost> User-Agent: Wanderlust/2.12.0 (Your Wildest Dreams) SEMI/1.14.6 (Maruoka) FLIM/1.14.7 (=?ISO-8859-4?Q?Sanj=F2?=) APEL/10.6 MULE XEmacs/21.5 (beta25) (eggplant) (+CVS-20060326) (i386-suse-linux) 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 X-Mailing-List: linux-kernel@vger.kernel.org At Mon, 26 Jun 2006 08:25:34 +0200, Johannes Berg wrote: > > When snd-aoa is not built or built as modules, but CONFIG_SND is yes, > kernel build fails due to a bug I introduced when adding snd-aoa. This > patch fixes it. > > From: Takashi Iwai > Signed-off-by: Johannes Berg Applied to ALSA repo. Thanks. Takashi > > --- a/sound/Makefile Fri Jun 23 15:18:41 2006 +0200 > +++ b/sound/Makefile Fri Jun 23 16:49:15 2006 +0200 > @@ -4,7 +4,8 @@ obj-$(CONFIG_SOUND) += soundcore.o > obj-$(CONFIG_SOUND) += soundcore.o > obj-$(CONFIG_SOUND_PRIME) += oss/ > obj-$(CONFIG_DMASOUND) += oss/ > -obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ synth/ usb/ sparc/ parisc/ pcmcia/ mips/ aoa/ > +obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ synth/ usb/ sparc/ parisc/ pcmcia/ mips/ > +obj-$(CONFIG_SND_AOA) += aoa/ > > ifeq ($(CONFIG_SND),y) > obj-y += last.o > >