aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-08-17 23:35:31 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-08-17 23:35:31 +0100
commit1593d7dd8c7b939e31b9d637307b26ada3e3c514 (patch)
treefcfdd26242d3171dd0c300bd18be30d6ca20bead /sound
parent75a6d53b2b1b3f212ea0615ed3bb2d68a249af7b (diff)
downloadkernel_goldelico_gta04-1593d7dd8c7b939e31b9d637307b26ada3e3c514.zip
kernel_goldelico_gta04-1593d7dd8c7b939e31b9d637307b26ada3e3c514.tar.gz
kernel_goldelico_gta04-1593d7dd8c7b939e31b9d637307b26ada3e3c514.tar.bz2
ASoC: Fix a few more PXA build errors
Dead pxa2xx-pcm.h includes and a missing , Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/pxa/corgi.c1
-rw-r--r--sound/soc/pxa/em-x270.c1
-rw-r--r--sound/soc/pxa/poodle.c2
3 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c
index 11c6a49..555689c 100644
--- a/sound/soc/pxa/corgi.c
+++ b/sound/soc/pxa/corgi.c
@@ -30,7 +30,6 @@
#include <mach/audio.h>
#include "../codecs/wm8731.h"
-#include "pxa2xx-pcm.h"
#include "pxa2xx-i2s.h"
#define CORGI_HP 0
diff --git a/sound/soc/pxa/em-x270.c b/sound/soc/pxa/em-x270.c
index 7046128..eadf9d3 100644
--- a/sound/soc/pxa/em-x270.c
+++ b/sound/soc/pxa/em-x270.c
@@ -32,7 +32,6 @@
#include <mach/audio.h>
#include "../codecs/wm9712.h"
-#include "pxa2xx-pcm.h"
#include "pxa2xx-ac97.h"
static struct snd_soc_dai_link em_x270_dai[] = {
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c
index 3ba5a96..add0e1c 100644
--- a/sound/soc/pxa/poodle.c
+++ b/sound/soc/pxa/poodle.c
@@ -267,7 +267,7 @@ static struct snd_soc_dai_link poodle_dai = {
.name = "WM8731",
.stream_name = "WM8731",
.cpu_dai_name = "pxa-i2s",
- .codec_dai_name = "wm8731-hifi"
+ .codec_dai_name = "wm8731-hifi",
.platform_name = "pxa-pcm-audio",
.codec_name = "wm8731-codec.0-001a",
.init = poodle_wm8731_init,