summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-01-23 11:23:32 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-01-23 11:23:32 +0000
commitc91cf25ebfbf3a5b336cbaa46646d37dd3d33127 (patch)
treea2b1e6a0b9cbd391e8b9ca020e42b76652c52c2c
parentff637d38ea6b9c54f708a2b9edabc1b0c73c6d0a (diff)
downloadlinux-c91cf25ebfbf3a5b336cbaa46646d37dd3d33127.tar.bz2
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>
-rw-r--r--sound/soc/pxa/e800_wm9712.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/pxa/e800_wm9712.c b/sound/soc/pxa/e800_wm9712.c
index 78a1770b986c..bc019cdce429 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"