Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16f9e062 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.38' into for-2.6.39

parents 0d42e6e7 a3adfa00

sound/soc/atmel/snd-soc-afeb9260.c

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static struct snd_soc_dai_link afeb9260_dai = { 
	.cpu_dai_name = "atmel-ssc-dai.0",

	.codec_dai_name = "tlv320aic23-hifi",

	.platform_name = "atmel_pcm-audio",

	.codec_name = "tlv320aic23-codec.0-0x1a",

	.codec_name = "tlv320aic23-codec.0-001a",

	.init = afeb9260_tlv320aic23_init,

	.ops = &afeb9260_ops,

};

sound/soc/blackfin/bf5xx-ssm2602.c

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static struct snd_soc_dai_link bf5xx_ssm2602_dai = { 
	.cpu_dai_name = "bf5xx-i2s",

	.codec_dai_name = "ssm2602-hifi",

	.platform_name = "bf5xx-pcm-audio",

	.codec_name = "ssm2602-codec.0-0x1b",

	.codec_name = "ssm2602-codec.0-001b",

	.ops = &bf5xx_ssm2602_ops,

};

sound/soc/pxa/corgi.c

+2 −2
Original line number Diff line number Diff line
@@ -307,10 +307,10 @@ static int corgi_wm8731_init(struct snd_soc_pcm_runtime *rtd) 
static struct snd_soc_dai_link corgi_dai = {

	.name = "WM8731",

	.stream_name = "WM8731",

	.cpu_dai_name = "pxa-is2-dai",

	.cpu_dai_name = "pxa2xx-i2s",

	.codec_dai_name = "wm8731-hifi",

	.platform_name = "pxa-pcm-audio",

	.codec_name = "wm8731-codec-0.001a",

	.codec_name = "wm8731-codec-0.001b",

	.init = corgi_wm8731_init,

	.ops = &corgi_ops,

};

sound/soc/pxa/poodle.c

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static struct snd_soc_dai_link poodle_dai = { 
	.cpu_dai_name = "pxa2xx-i2s",

	.codec_dai_name = "wm8731-hifi",

	.platform_name = "pxa-pcm-audio",

	.codec_name = "wm8731-codec.0-001a",

	.codec_name = "wm8731-codec.0-001b",

	.init = poodle_wm8731_init,

	.ops = &poodle_ops,

};

sound/soc/pxa/spitz.c

+2 −2
Original line number Diff line number Diff line
@@ -315,10 +315,10 @@ static int spitz_wm8750_init(struct snd_soc_pcm_runtime *rtd) 
static struct snd_soc_dai_link spitz_dai = {

	.name = "wm8750",

	.stream_name = "WM8750",

	.cpu_dai_name = "pxa-is2",

	.cpu_dai_name = "pxa2xx-i2s",

	.codec_dai_name = "wm8750-hifi",

	.platform_name = "pxa-pcm-audio",

	.codec_name = "wm8750-codec.0-001a",

	.codec_name = "wm8750-codec.0-001b",

	.init = spitz_wm8750_init,

	.ops = &spitz_ops,

};