summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/devices.c
diff options
context:
space:
mode:
authorJarkko Nikula <jhnikula@gmail.com>2010-10-04 16:04:53 +0400
committerLiam Girdwood <lrg@slimlogic.co.uk>2010-10-04 23:48:36 +0400
commita09f73fabbeac81f45969ad9ed59e74fae736873 (patch)
tree1dae0272d60dbf14baf56cd59cf7d278a6a0714f /arch/arm/mach-omap2/devices.c
parent0b452f2efa35c48219d1ad3cbebdd786ec39ef06 (diff)
downloadlinux-a09f73fabbeac81f45969ad9ed59e74fae736873.tar.xz
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 'arch/arm/mach-omap2/devices.c')
-rw-r--r--arch/arm/mach-omap2/devices.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 08e1ad5adb14..512ae4696a6c 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"