| Message ID | 1349274686-45668-1-git-send-email-tim.gardner@canonical.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 10/03/2012 05:31 PM, Tim Gardner wrote: > Cc: Peter Ujfalusi <peter.ujfalusi@ti.com> > Cc: Jarkko Nikula <jarkko.nikula@bitmer.com> > Cc: Liam Girdwood <lrg@ti.com> > Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> > Cc: Jaroslav Kysela <perex@perex.cz> > Cc: Takashi Iwai <tiwai@suse.de> > Cc: linux-omap@vger.kernel.org > Cc: alsa-devel@alsa-project.org > Signed-off-by: Tim Gardner <tim.gardner@canonical.com> > --- > 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. Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
* Peter Ujfalusi <peter.ujfalusi@ti.com> [121003 07:52]: > On 10/03/2012 05:31 PM, Tim Gardner wrote: > > Cc: Peter Ujfalusi <peter.ujfalusi@ti.com> > > Cc: Jarkko Nikula <jarkko.nikula@bitmer.com> > > Cc: Liam Girdwood <lrg@ti.com> > > Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> > > Cc: Jaroslav Kysela <perex@perex.cz> > > Cc: Takashi Iwai <tiwai@suse.de> > > Cc: linux-omap@vger.kernel.org > > Cc: alsa-devel@alsa-project.org > > Signed-off-by: Tim Gardner <tim.gardner@canonical.com> > > --- > > 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. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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>
Cc: Peter Ujfalusi <peter.ujfalusi@ti.com> Cc: Jarkko Nikula <jarkko.nikula@bitmer.com> Cc: Liam Girdwood <lrg@ti.com> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: Jaroslav Kysela <perex@perex.cz> Cc: Takashi Iwai <tiwai@suse.de> Cc: linux-omap@vger.kernel.org Cc: alsa-devel@alsa-project.org Signed-off-by: Tim Gardner <tim.gardner@canonical.com> --- sound/soc/omap/zoom2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)