From 1593d7dd8c7b939e31b9d637307b26ada3e3c514 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Tue, 17 Aug 2010 23:35:31 +0100 Subject: [PATCH] ASoC: Fix a few more PXA build errors Dead pxa2xx-pcm.h includes and a missing , Signed-off-by: Mark Brown Acked-by: Liam Girdwood --- sound/soc/pxa/corgi.c | 1 - sound/soc/pxa/em-x270.c | 1 - sound/soc/pxa/poodle.c | 2 +- 3 files changed, 1 insertion(+), 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 @@ #include #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 7046128b2a4c..eadf9d351a04 100644 --- a/sound/soc/pxa/em-x270.c +++ b/sound/soc/pxa/em-x270.c @@ -32,7 +32,6 @@ #include #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 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 = { .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, -- 2.11.0