[alsa-devel] [PATCH] omap: devices: Avoid merge conflict between ASoC and OMAP hwmod changes

[Liam Girdwood]

On Mon, 2010-10-04 at 08:04 -0700, Mark Brown wrote:
> On Mon, Oct 04, 2010 at 03:04:53PM +0300, Jarkko Nikula wrote:
> > Upcoming ASoC multi-component and OMAP hwmod changes will conflict
> > in arch/arm/mach-omap2/devices.c. Avoid this by moving a little bit
> > include statement introduced by ASoC Multi-Component Support patch.
> > 
> > Signed-off-by: Jarkko Nikula <jhnikula at gmail.com>
> > Cc: Paul Walmsley <paul at pwsan.com>
> > Cc: Tony Lindgren <tony at atomide.com>
> 
> Acked-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

Applied.

Thanks

Liam
-- 
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk