Commit c91cf25e authored Jan 23, 2009 by Mark Brown

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>

parent ff637d38

sound/soc/pxa/e800_wm9712.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -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"