diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-17 18:35:31 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-17 18:35:31 -0400 |
commit | 1593d7dd8c7b939e31b9d637307b26ada3e3c514 (patch) | |
tree | fcfdd26242d3171dd0c300bd18be30d6ca20bead /sound/soc/pxa | |
parent | 75a6d53b2b1b3f212ea0615ed3bb2d68a249af7b (diff) |
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/soc/pxa')
-rw-r--r-- | sound/soc/pxa/corgi.c | 1 | ||||
-rw-r--r-- | sound/soc/pxa/em-x270.c | 1 | ||||
-rw-r--r-- | sound/soc/pxa/poodle.c | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c index 11c6a495f970..555689cf6727 100644 --- a/sound/soc/pxa/corgi.c +++ b/sound/soc/pxa/corgi.c | |||
@@ -30,7 +30,6 @@ | |||
30 | #include <mach/audio.h> | 30 | #include <mach/audio.h> |
31 | 31 | ||
32 | #include "../codecs/wm8731.h" | 32 | #include "../codecs/wm8731.h" |
33 | #include "pxa2xx-pcm.h" | ||
34 | #include "pxa2xx-i2s.h" | 33 | #include "pxa2xx-i2s.h" |
35 | 34 | ||
36 | #define CORGI_HP 0 | 35 | #define CORGI_HP 0 |
diff --git a/sound/soc/pxa/em-x270.c b/sound/soc/pxa/em-x270.c index 7046128b2a4c..eadf9d351a04 100644 --- a/sound/soc/pxa/em-x270.c +++ b/sound/soc/pxa/em-x270.c | |||
@@ -32,7 +32,6 @@ | |||
32 | #include <mach/audio.h> | 32 | #include <mach/audio.h> |
33 | 33 | ||
34 | #include "../codecs/wm9712.h" | 34 | #include "../codecs/wm9712.h" |
35 | #include "pxa2xx-pcm.h" | ||
36 | #include "pxa2xx-ac97.h" | 35 | #include "pxa2xx-ac97.h" |
37 | 36 | ||
38 | static struct snd_soc_dai_link em_x270_dai[] = { | 37 | static struct snd_soc_dai_link em_x270_dai[] = { |
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c index 3ba5a962ecb8..add0e1c25bc8 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 = { | |||
267 | .name = "WM8731", | 267 | .name = "WM8731", |
268 | .stream_name = "WM8731", | 268 | .stream_name = "WM8731", |
269 | .cpu_dai_name = "pxa-i2s", | 269 | .cpu_dai_name = "pxa-i2s", |
270 | .codec_dai_name = "wm8731-hifi" | 270 | .codec_dai_name = "wm8731-hifi", |
271 | .platform_name = "pxa-pcm-audio", | 271 | .platform_name = "pxa-pcm-audio", |
272 | .codec_name = "wm8731-codec.0-001a", | 272 | .codec_name = "wm8731-codec.0-001a", |
273 | .init = poodle_wm8731_init, | 273 | .init = poodle_wm8731_init, |