Commit a09f73fa authored Oct 04, 2010 by Jarkko Nikula Committed by Liam Girdwood Oct 04, 2010

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>

parent 0b452f2e

arch/arm/mach-omap2/devices.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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"