diff options
Diffstat (limited to 'sound/soc/pxa/em-x270.c')
| -rw-r--r-- | sound/soc/pxa/em-x270.c | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/pxa/em-x270.c b/sound/soc/pxa/em-x270.c index eadf9d351a0..64743a05aea 100644 --- a/sound/soc/pxa/em-x270.c +++ b/sound/soc/pxa/em-x270.c @@ -26,7 +26,6 @@  #include <sound/core.h>  #include <sound/pcm.h>  #include <sound/soc.h> -#include <sound/soc-dapm.h>  #include <asm/mach-types.h>  #include <mach/audio.h> @@ -38,7 +37,7 @@ static struct snd_soc_dai_link em_x270_dai[] = {  	{  		.name = "AC97",  		.stream_name = "AC97 HiFi", -		.cpu_dai_name = "pxa-ac97.0", +		.cpu_dai_name = "pxa2xx-ac97",  		.codec_dai_name = "wm9712-hifi",  		.platform_name = "pxa-pcm-audio",  		.codec_name = "wm9712-codec", @@ -46,7 +45,7 @@ static struct snd_soc_dai_link em_x270_dai[] = {  	{  		.name = "AC97 Aux",  		.stream_name = "AC97 Aux", -		.cpu_dai_name = "pxa-ac97.1", +		.cpu_dai_name = "pxa2xx-ac97-aux",  		.codec_dai_name ="wm9712-aux",  		.platform_name = "pxa-pcm-audio",  		.codec_name = "wm9712-codec", @@ -55,6 +54,7 @@ static struct snd_soc_dai_link em_x270_dai[] = {  static struct snd_soc_card em_x270 = {  	.name = "EM-X270", +	.owner = THIS_MODULE,  	.dai_link = em_x270_dai,  	.num_links = ARRAY_SIZE(em_x270_dai),  };  | 
