[alsa-devel] [PATCH 3/9] ASoC: Fix merge with PXA tree

Fix a merge issue caused by context overlap.

Reported-by: Stephen Rothwell sfr@canb.auug.org.au Signed-off-by: Mark Brown broonie@opensource.wolfsonmicro.com --- 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"