Skip to contentSkip to conversation

omap: devices: Avoid merge conflict between ASoC and OMAP hwmod changes

PATCH Applied Jarkko Nikula 3 participants 3 messages Oct 4, 2010

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

Jarkko Nikula

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
Cc Paul Walmsley <[email protected]>
Cc Tony Lindgren <[email protected]>

---
This is intended to be merged with "ASoC: multi-component - ASoC Multi-Component Support" patch via ASoC tree.

---
 arch/arm/mach-omap2/devices.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/devices.c +1 -1
index 08e1ad5..512ae46 100644
@@ -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"
Signature · 1 line
1.7.1
Applied
#2 lore raw
Quoted 10 lines · Mark Brown
Quoted 7 lines · Jarkko Nikula

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 <[email protected]>
Cc Paul Walmsley <[email protected]>
Cc Tony Lindgren <[email protected]>
Acked-by Mark Brown <[email protected]>

Applied.

Thanks

Liam

Signature · 3 lines
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk