diff options
| author |   Jarkko Nikula <jhnikula@gmail.com> | 2010-10-04 15:04:53 +0300 |
|---|---|---|
| committer |   Liam Girdwood <lrg@slimlogic.co.uk> | 2010-10-04 20:48:36 +0100 |
| commit | a09f73fabbeac81f45969ad9ed59e74fae736873 (patch) | |
| tree | 1dae0272d60dbf14baf56cd59cf7d278a6a0714f /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge branch 'for-2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into topic/asoc (diff) | |
| download | linux-dev-a09f73fabbeac81f45969ad9ed59e74fae736873.tar.xz linux-dev-a09f73fabbeac81f45969ad9ed59e74fae736873.zip | |
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>
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions