Commit c91cf25e authored by Mark Brown's avatar Mark Brown

ASoC: Fix merge with PXA tree

Fix a merge issue caused by context overlap.
Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent ff637d38
...@@ -18,13 +18,10 @@ ...@@ -18,13 +18,10 @@
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/soc-dapm.h> #include <sound/soc-dapm.h>
#include <mach/pxa-regs.h> #include <asm/mach-types.h>
#include <mach/hardware.h>
#include <mach/audio.h> #include <mach/audio.h>
#include <mach/eseries-gpio.h> #include <mach/eseries-gpio.h>
#include <asm/mach-types.h>
#include "../codecs/wm9712.h" #include "../codecs/wm9712.h"
#include "pxa2xx-pcm.h" #include "pxa2xx-pcm.h"
#include "pxa2xx-ac97.h" #include "pxa2xx-ac97.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment