* [PATCH] omap: devices: Avoid merge conflict between ASoC and OMAP hwmod changes
@ 2010-10-04 12:04 Jarkko Nikula
2010-10-04 15:04 ` Mark Brown
0 siblings, 1 reply; 3+ messages in thread
From: Jarkko Nikula @ 2010-10-04 12:04 UTC (permalink / raw)
To: alsa-devel
Cc: linux-omap, Liam Girdwood, Mark Brown, Jarkko Nikula,
Paul Walmsley, Tony Lindgren
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>
---
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(-)
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"
--
1.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] omap: devices: Avoid merge conflict between ASoC and OMAP hwmod changes
2010-10-04 12:04 [PATCH] omap: devices: Avoid merge conflict between ASoC and OMAP hwmod changes Jarkko Nikula
@ 2010-10-04 15:04 ` Mark Brown
2010-10-04 19:49 ` [alsa-devel] " Liam Girdwood
0 siblings, 1 reply; 3+ messages in thread
From: Mark Brown @ 2010-10-04 15:04 UTC (permalink / raw)
To: Jarkko Nikula
Cc: alsa-devel, linux-omap, Liam Girdwood, Paul Walmsley,
Tony Lindgren
On Mon, Oct 04, 2010 at 03:04:53PM +0300, Jarkko Nikula wrote:
> 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>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [alsa-devel] [PATCH] omap: devices: Avoid merge conflict between ASoC and OMAP hwmod changes
2010-10-04 15:04 ` Mark Brown
@ 2010-10-04 19:49 ` Liam Girdwood
0 siblings, 0 replies; 3+ messages in thread
From: Liam Girdwood @ 2010-10-04 19:49 UTC (permalink / raw)
To: Mark Brown
Cc: Jarkko Nikula, Tony Lindgren, alsa-devel, linux-omap,
Paul Walmsley
On Mon, 2010-10-04 at 08:04 -0700, Mark Brown wrote:
> On Mon, Oct 04, 2010 at 03:04:53PM +0300, Jarkko Nikula wrote:
> > 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>
Applied.
Thanks
Liam
--
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-10-04 19:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-04 12:04 [PATCH] omap: devices: Avoid merge conflict between ASoC and OMAP hwmod changes Jarkko Nikula
2010-10-04 15:04 ` Mark Brown
2010-10-04 19:49 ` [alsa-devel] " Liam Girdwood
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).