Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964956Ab2JCQbK (ORCPT ); Wed, 3 Oct 2012 12:31:10 -0400 Received: from mho-04-ewr.mailhop.org ([204.13.248.74]:19994 "EHLO mho-02-ewr.mailhop.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932530Ab2JCQbI (ORCPT ); Wed, 3 Oct 2012 12:31:08 -0400 X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 98.234.237.12 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1/oDrZH5tff6k2yE8KpqWU8 Date: Wed, 3 Oct 2012 09:31:02 -0700 From: Tony Lindgren To: Peter Ujfalusi Cc: Tim Gardner , linux-kernel@vger.kernel.org, Jarkko Nikula , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , linux-omap@vger.kernel.org, alsa-devel@alsa-project.org Subject: Re: [PATCH 3.7-rc1] omap zoom2.c: Fix compile error by including correct header files Message-ID: <20121003163102.GB4840@atomide.com> References: <1349274686-45668-1-git-send-email-tim.gardner@canonical.com> <506C5124.3050200@ti.com> <20121003155900.GA4840@atomide.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20121003155900.GA4840@atomide.com> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3425 Lines: 99 * Tony Lindgren [121003 09:00]: > * Peter Ujfalusi [121003 07:52]: > > On 10/03/2012 05:31 PM, Tim Gardner wrote: > > > Cc: Peter Ujfalusi > > > Cc: Jarkko Nikula > > > Cc: Liam Girdwood > > > Cc: Mark Brown > > > Cc: Jaroslav Kysela > > > Cc: Takashi Iwai > > > Cc: linux-omap@vger.kernel.org > > > Cc: alsa-devel@alsa-project.org > > > Signed-off-by: Tim Gardner > > > --- > > > sound/soc/omap/zoom2.c | 3 ++- > > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > > > diff --git a/sound/soc/omap/zoom2.c b/sound/soc/omap/zoom2.c > > > index 23de2b2..d0a8c92 100644 > > > --- a/sound/soc/omap/zoom2.c > > > +++ b/sound/soc/omap/zoom2.c > > > @@ -27,9 +27,10 @@ > > > > > > #include > > > #include > > > -#include > > > +#include > > > #include > > > #include > > > +#include > > > > > > /* Register descriptions for twl4030 codec part */ > > > #include > > > > > > > I have the same patch stashed away for the same issue. Was waiting for rc1 to > > send it. > > Can you please update the patch to also to remove the > "#include " while at it? > > AFAIK it's not needed at all and just adds a dependency to asoc with > my upcoming plat header cleanup patches. Actually we can also drop "#include " too, it's now empty for mach-omap2. I've updated Tim's patch below for you guys to queue via the ASoC fixes. It's against the current linux next. Regards, Tony From: Tim Gardner Date: Wed, 3 Oct 2012 08:31:26 -0600 Subject: [PATCH] omap zoom2.c: Fix compile error by including correct header files Also drop the includes that are no longer needed and just cause problems for the ARM common zImage. Acked-by: Peter Ujfalusi Cc: Jarkko Nikula Cc: Liam Girdwood Cc: Mark Brown Cc: Jaroslav Kysela Cc: Takashi Iwai Cc: linux-omap@vger.kernel.org Cc: alsa-devel@alsa-project.org Signed-off-by: Tim Gardner [tony@atomide.com: updated to drop unneeded headers] Signed-off-by: Tony Lindgren diff --git a/sound/soc/omap/zoom2.c b/sound/soc/omap/zoom2.c index 677b567..1ff6bb9 100644 --- a/sound/soc/omap/zoom2.c +++ b/sound/soc/omap/zoom2.c @@ -21,15 +21,14 @@ #include #include +#include #include #include #include #include -#include -#include -#include #include +#include /* Register descriptions for twl4030 codec part */ #include -- 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/