Commit-ID: 1593d7dd8c7b939e31b9d637307b26ada3e3c514
Gitweb: http://git.kernel.org/tip/1593d7dd8c7b939e31b9d637307b26ada3e3c514
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
AuthorDate: Tue, 17 Aug 2010 23:35:31 +0100
Committer: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
CommitDate: Tue, 17 Aug 2010 23:35:31 +0100
ASoC: Fix a few more PXA build errors
Dead pxa2xx-pcm.h includes and a missing ,
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Acked-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
---
sound/soc/pxa/corgi.c | 1 -
sound/soc/pxa/em-x270.c | 1 -
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 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,
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|