diff options
| author | Jarkko Nikula <jhnikula@gmail.com> | 2010-10-04 12:04:53 (GMT) |
|---|---|---|
| committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2010-10-04 19:48:36 (GMT) |
| commit | a09f73fabbeac81f45969ad9ed59e74fae736873 (patch) | |
| tree | 1dae0272d60dbf14baf56cd59cf7d278a6a0714f /arch/arm | |
| parent | 0b452f2efa35c48219d1ad3cbebdd786ec39ef06 (diff) | |
| download | linux-fsl-qoriq-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')
| -rw-r--r-- | arch/arm/mach-omap2/devices.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 08e1ad5..512ae46 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" |