Subject: Re: linux-next: manual merge of the sound tree with the pxa tree

From: Mark Brown <[email-masked]>
Date: Fri, 23 Jan 2009 11:31:24 +0000

On Fri, Jan 23, 2009 at 03:08:06AM +0000, Ian Molton wrote:
> Stephen Rothwell wrote:

>> Just overlapping context changes.  I fixed it up (see below) and can
>> carry the fix as necessary.

> Looks good. If it needs acking, then

> Acked-by: Ian Molton <[email-masked]>

Stephen's fix didn't apply directly to the ASoC tree so I've applied the
slightly different fix below which merges cleanly with the PXA commit
for me:

>>From c91cf25ebfbf3a5b336cbaa46646d37dd3d33127 Mon Sep 17 00:00:00 2001
From: Mark Brown <[email-masked]>
Date: Fri, 23 Jan 2009 11:23:32 +0000
Subject: [PATCH] ASoC: Fix merge with PXA tree

Fix a merge issue caused by context overlap.

Reported-by: Stephen Rothwell <[email-masked]>
Signed-off-by: Mark Brown <[email-masked]>
---
 sound/soc/pxa/e800_wm9712.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/sound/soc/pxa/e800_wm9712.c b/sound/soc/pxa/e800_wm9712.c
index 78a1770..bc019cd 100644
--- a/sound/soc/pxa/e800_wm9712.c
+++ b/sound/soc/pxa/e800_wm9712.c
@@ -18,13 +18,10 @@
 #include <sound/soc.h>
 #include <sound/soc-dapm.h>
 
-#include <mach/pxa-regs.h>
-#include <mach/hardware.h>
+#include <asm/mach-types.h>
 #include <mach/audio.h>
 #include <mach/eseries-gpio.h>
 
-#include <asm/mach-types.h>
-
 #include "../codecs/wm9712.h"
 #include "pxa2xx-pcm.h"
 #include "pxa2xx-ac97.h"
-- 
1.5.6.5