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>
--
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


[Index of Archives]     [Linux Arm (vger)]     [ARM Kernel]     [ARM MSM]     [Linux Tegra]     [Linux WPAN Networking]     [Linux Wireless Networking]     [Maemo Users]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux