[3.7-rc1] omap zoom2.c: Fix compile error by including correct header files

Commit Message

Tony Lindgren Oct. 3, 2012, 4:31 p.m. UTC

* Tony Lindgren <[e-mail]> [121003 09:00]:
> * Peter Ujfalusi <[e-mail]> [121003 07:52]:
> > On 10/03/2012 05:31 PM, Tim Gardner wrote:
> > > Cc: Peter Ujfalusi <[e-mail]>
> > > Cc: Jarkko Nikula <[e-mail]>
> > > Cc: Liam Girdwood <[e-mail]>
> > > Cc: Mark Brown <[e-mail]>
> > > Cc: Jaroslav Kysela <[e-mail]>
> > > Cc: Takashi Iwai <[e-mail]>
> > > Cc: [e-mail]
> > > Cc: [e-mail]
> > > Signed-off-by: Tim Gardner <[e-mail]>
> > > ---
> > >  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 <asm/mach-types.h>
> > >  #include <mach/hardware.h>
> > > -#include <mach/gpio.h>
> > > +#include <linux/gpio.h>
> > >  #include <mach/board-zoom.h>
> > >  #include <linux/platform_data/asoc-ti-mcbsp.h>
> > > +#include <linux/platform_data/gpio-omap.h>
> > >  
> > >  /* Register descriptions for twl4030 codec part */
> > >  #include <linux/mfd/twl4030-audio.h>
> > > 
> > 
> > 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 <mach/board-zoom.h>" 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 <mach/hardware.h>" 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 <[e-mail]>
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 <[e-mail]>
Cc: Jarkko Nikula <[e-mail]>
Cc: Liam Girdwood <[e-mail]>
Cc: Mark Brown <[e-mail]>
Cc: Jaroslav Kysela <[e-mail]>
Cc: Takashi Iwai <[e-mail]>
Cc: [e-mail]
Cc: [e-mail]
Signed-off-by: Tim Gardner <[e-mail]>
[[e-mail]: updated to drop unneeded headers]
Signed-off-by: Tony Lindgren <[e-mail]>

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Mark Brown Oct. 27, 2012, 9:44 p.m. UTC | #1

On Wed, Oct 03, 2012 at 09:31:02AM -0700, Tony Lindgren wrote:

> Actually we can also drop "#include <mach/hardware.h>" 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.

Applied.  Tim, you should send patches using subject lines appropriate
for the subsystem you're submitting against *especially* if the patch is
to be deferred for some future time as it makes it harder to search for
the patch.  If your changelog looks different to the other changelogs
for the thing you're patching that should be a warning.

Patch

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 <linux/clk.h>
 #include <linux/platform_device.h>
+#include <linux/gpio.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/soc.h>
 
 #include <asm/mach-types.h>
-#include <mach/hardware.h>
-#include <mach/gpio.h>
-#include <mach/board-zoom.h>
 #include <linux/platform_data/asoc-ti-mcbsp.h>
+#include <linux/platform_data/gpio-omap.h>
 
 /* Register descriptions for twl4030 codec part */
 #include <linux/mfd/twl4030-audio.h>