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

Commit 5448716b authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.38' into for-2.6.39

parents a3cd50de 4bfc4e25

sound/soc/pxa/e740_wm9705.c

+2 −2
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static struct snd_soc_dai_link e740_dai[] = { 
	{

		.name = "AC97",

		.stream_name = "AC97 HiFi",

		.cpu_dai_name = "pxa-ac97.0",

		.cpu_dai_name = "pxa2xx-ac97",

		.codec_dai_name = "wm9705-hifi",

		.platform_name = "pxa-pcm-audio",

		.codec_name = "wm9705-codec",
@@ -126,7 +126,7 @@ static struct snd_soc_dai_link e740_dai[] = { 
	{

		.name = "AC97 Aux",

		.stream_name = "AC97 Aux",

		.cpu_dai_name = "pxa-ac97.1",

		.cpu_dai_name = "pxa2xx-ac97-aux",

		.codec_dai_name = "wm9705-aux",

		.platform_name = "pxa-pcm-audio",

		.codec_name = "wm9705-codec",

sound/soc/pxa/e750_wm9705.c

+2 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static struct snd_soc_dai_link e750_dai[] = { 
	{

		.name = "AC97",

		.stream_name = "AC97 HiFi",

		.cpu_dai_name = "pxa-ac97.0",

		.cpu_dai_name = "pxa2xx-ac97",

		.codec_dai_name = "wm9705-hifi",

		.platform_name = "pxa-pcm-audio",

		.codec_name = "wm9705-codec",
@@ -109,7 +109,7 @@ static struct snd_soc_dai_link e750_dai[] = { 
	{

		.name = "AC97 Aux",

		.stream_name = "AC97 Aux",

		.cpu_dai_name = "pxa-ac97.1",

		.cpu_dai_name = "pxa2xx-ac97-aux",

		.codec_dai_name ="wm9705-aux",

		.platform_name = "pxa-pcm-audio",

		.codec_name = "wm9705-codec",

sound/soc/pxa/e800_wm9712.c

+2 −2
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static struct snd_soc_dai_link e800_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",
@@ -98,7 +98,7 @@ static struct snd_soc_dai_link e800_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",

sound/soc/pxa/em-x270.c

+2 −2
Original line number Diff line number Diff line
@@ -37,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",
@@ -45,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",

sound/soc/pxa/mioa701_wm9713.c

+2 −2
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ static struct snd_soc_dai_link mioa701_dai[] = { 
	{

		.name = "AC97",

		.stream_name = "AC97 HiFi",

		.cpu_dai_name = "pxa-ac97.0",

		.cpu_dai_name = "pxa2xx-ac97",

		.codec_dai_name = "wm9713-hifi",

		.codec_name = "wm9713-codec",

		.init = mioa701_wm9713_init,
@@ -172,7 +172,7 @@ static struct snd_soc_dai_link mioa701_dai[] = { 
	{

		.name = "AC97 Aux",

		.stream_name = "AC97 Aux",

		.cpu_dai_name = "pxa-ac97.1",

		.cpu_dai_name = "pxa2xx-ac97-aux",

		.codec_dai_name ="wm9713-aux",

		.codec_name = "wm9713-codec",

		.platform_name = "pxa-pcm-audio",