From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754135Ab0JZTbd (ORCPT ); Tue, 26 Oct 2010 15:31:33 -0400 Received: from cantor2.suse.de ([195.135.220.15]:52755 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751279Ab0JZTbb (ORCPT ); Tue, 26 Oct 2010 15:31:31 -0400 Date: Tue, 26 Oct 2010 21:31:30 +0200 Message-ID: From: Takashi Iwai To: Liam Girdwood Cc: Arnaud Lacombe , Linus Torvalds , Andrew Morton , linux-kernel@vger.kernel.org, Mark Brown Subject: Re: [GIT PULL] sound updates for 2.6.37-rc1 In-Reply-To: <1288120063.18037.64.camel@vega> References: <1288120063.18037.64.camel@vega> 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.1 (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 At Tue, 26 Oct 2010 20:07:43 +0100, Liam Girdwood wrote: > > On Tue, 2010-10-26 at 14:20 -0400, Arnaud Lacombe wrote: > > Hi, > > > > On Mon, Oct 25, 2010 at 9:59 AM, Takashi Iwai wrote: > > > Linus, > > > > > > === > > > [...] > > > > > > Liam Girdwood (3): > > > ASoC: multi-component - ASoC Multi-Component Support > > > [...] > > > include/sound/soc-of-simple.h | 25 - > > > [...] > > > delete mode 100644 include/sound/soc-of-simple.h > > > > > `sound/soc/fsl/pcm030-audio-fabric.c' still reference > > `sound/soc-of-simple.h', causing the following build error: > > > > sound/soc/fsl/pcm030-audio-fabric.c:27:33: fatal error: > > sound/soc-of-simple.h: No such file or directory > > > > Gah, missed that one, wonder why -next PPC build did not pick this one > up. Fwiw, I'm on train now to ELC-E now so can't test the following > patch with PPC gcc until the weekend. > > Takashi, please apply the following fix. Applied now. Thanks. I'm going to send another pull request if no other problem is found. Takashi > >From 70c38adabd9380f5351a96f62e615d0e6ec7a533 Mon Sep 17 00:00:00 2001 > From: Liam Girdwood > Date: Tue, 26 Oct 2010 20:00:54 +0100 > Subject: [PATCH] ASoC: fsl - fix build error in pcm030-audio-fabric.c > > Fix build error:- > > sound/soc/fsl/pcm030-audio-fabric.c:27:33: fatal error: > sound/soc-of-simple.h: No such file or directory > > Signed-off-by: Liam Girdwood > --- > sound/soc/fsl/pcm030-audio-fabric.c | 3 +-- > 1 files changed, 1 insertions(+), 2 deletions(-) > > diff --git a/sound/soc/fsl/pcm030-audio-fabric.c b/sound/soc/fsl/pcm030-audio-fabric.c > index fe15bb2..25f27ec 100644 > --- a/sound/soc/fsl/pcm030-audio-fabric.c > +++ b/sound/soc/fsl/pcm030-audio-fabric.c > @@ -24,7 +24,6 @@ > #include > #include > #include > -#include > > #include "mpc5200_dma.h" > #include "mpc5200_psc_ac97.h" > @@ -49,7 +48,7 @@ static struct snd_soc_dai_link pcm030_fabric_dai[] = { > .codec_dai_name = "wm9712-aux", > .cpu_dai_name = "mpc5200-psc-ac97.1", > .platform_name = "mpc5200-pcm-audio", > - ..codec_name = "wm9712-codec", > + .codec_name = "wm9712-codec", > }, > }; > > -- > 1.7.1 > > Thanks > > Liam > > -- > Freelance Developer, SlimLogic Ltd > ASoC and Voltage Regulator Maintainer. > http://www.slimlogic.co.uk >