author | Jarkko Nikula <jhnikula@gmail.com> | |
Mon, 4 Oct 2010 12:04:53 +0000 (15:04 +0300) | ||
committer | Liam Girdwood <lrg@slimlogic.co.uk> | |
Mon, 4 Oct 2010 19:48:36 +0000 (20:48 +0100) | ||
commit | a09f73fabbeac81f45969ad9ed59e74fae736873 | |
tree | 1dae0272d60dbf14baf56cd59cf7d278a6a0714f | tree | snapshot (tar.xz tar.gz zip) |
parent | 0b452f2efa35c48219d1ad3cbebdd786ec39ef06 | commit | diff |
omap: devices: Avoid merge conflict between ASoC and OMAP hwmod changes
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@gmail.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Tony Lindgren <tony@atomide.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
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@gmail.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Tony Lindgren <tony@atomide.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
arch/arm/mach-omap2/devices.c | diff | blob | history |