summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorHaojian Zhuang2010-08-13 15:55:27 +0200
committerMark Brown2010-08-15 15:50:48 +0200
commitdd99a4524bd9f82358e9a20a44c5e784baa4e702 (patch)
tree89b6cc2d4d560611087bfcb1c7545773e144b48f /sound/soc
parentASoC: multi-component: Fix reference to moved header file, which was unused a... (diff)
downloadkernel-qcow2-linux-dd99a4524bd9f82358e9a20a44c5e784baa4e702.tar.gz
kernel-qcow2-linux-dd99a4524bd9f82358e9a20a44c5e784baa4e702.tar.xz
kernel-qcow2-linux-dd99a4524bd9f82358e9a20a44c5e784baa4e702.zip
ASoC: fix pxa2xx-pcm.h path
Since pxa2xx-pcm.h is removed from sound/soc/pxa, we need to update the path in related files. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Tested-by: Ian Lartey <ian@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/pxa/pxa-ssp.c2
-rw-r--r--sound/soc/pxa/pxa2xx-pcm.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
index 99d80e85621c..c4f480d67a50 100644
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -35,7 +35,7 @@
#include <mach/audio.h>
#include <plat/ssp.h>
-#include "pxa2xx-pcm.h"
+#include "../../arm/pxa2xx-pcm.h"
#include "pxa-ssp.h"
/*
diff --git a/sound/soc/pxa/pxa2xx-pcm.c b/sound/soc/pxa/pxa2xx-pcm.c
index 5127044acfec..02fb66416ddc 100644
--- a/sound/soc/pxa/pxa2xx-pcm.c
+++ b/sound/soc/pxa/pxa2xx-pcm.c
@@ -16,7 +16,6 @@
#include <sound/soc.h>
#include <sound/pxa2xx-lib.h>
-#include "pxa2xx-pcm.h"
#include "../../arm/pxa2xx-pcm.h"
static int pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream,