From: Jarkko Nikula <jhnikula@gmail.com>
Date: Mon, 4 Oct 2010 12:04:53 +0000 (+0300)
Subject: omap: devices: Avoid merge conflict between ASoC and OMAP hwmod changes
X-Git-Tag: v2.6.37-rc1~126^2~1^2~44^2~1
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a09f73fabbeac81f45969ad9ed59e74fae736873;p=~emulex%2Finfiniband.git

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

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 08e1ad5adb1..512ae4696a6 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -25,10 +25,10 @@
 #include <plat/control.h>
 #include <plat/tc.h>
 #include <plat/board.h>
+#include <plat/mcbsp.h>
 #include <mach/gpio.h>
 #include <plat/mmc.h>
 #include <plat/dma.h>
-#include <plat/mcbsp.h>
 
 #include "mux.h"