Re: [PATCH] omap: devices: Avoid merge conflict between ASoC and OMAP hwmod changes

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxx>
> Cc: Paul Walmsley <paul@xxxxxxxxx>
> Cc: Tony Lindgren <tony@xxxxxxxxxxx>

Acked-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel


[Index of Archives]     [ALSA User]     [Linux Audio Users]     [Kernel Archive]     [Asterisk PBX]     [Photo Sharing]     [Linux Sound]     [Video 4 Linux]     [Gimp]     [Yosemite News]

  Powered by Linux