* Tony Lindgren <tony@xxxxxxxxxxx> [121003 09:00]: > * Peter Ujfalusi <peter.ujfalusi@xxxxxx> [121003 07:52]: > > On 10/03/2012 05:31 PM, Tim Gardner wrote: > > > Cc: Peter Ujfalusi <peter.ujfalusi@xxxxxx> > > > Cc: Jarkko Nikula <jarkko.nikula@xxxxxxxxxx> > > > Cc: Liam Girdwood <lrg@xxxxxx> > > > Cc: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx> > > > Cc: Jaroslav Kysela <perex@xxxxxxxx> > > > Cc: Takashi Iwai <tiwai@xxxxxxx> > > > Cc: linux-omap@xxxxxxxxxxxxxxx > > > Cc: alsa-devel@xxxxxxxxxxxxxxxx > > > Signed-off-by: Tim Gardner <tim.gardner@xxxxxxxxxxxxx> > > > --- > > > 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 <tim.gardner@xxxxxxxxxxxxx> 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 <peter.ujfalusi@xxxxxx> Cc: Jarkko Nikula <jarkko.nikula@xxxxxxxxxx> Cc: Liam Girdwood <lrg@xxxxxx> Cc: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx> Cc: Jaroslav Kysela <perex@xxxxxxxx> Cc: Takashi Iwai <tiwai@xxxxxxx> Cc: linux-omap@xxxxxxxxxxxxxxx Cc: alsa-devel@xxxxxxxxxxxxxxxx Signed-off-by: Tim Gardner <tim.gardner@xxxxxxxxxxxxx> [tony@xxxxxxxxxxx: updated to drop unneeded headers] Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx> 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> -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
