mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
Merge branch 'for-2.6.38' into for-2.6.39
This commit is contained in:
commit
5448716ba9
8 changed files with 16 additions and 16 deletions
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -132,7 +132,7 @@ static struct snd_soc_dai_link palm27x_dai[] = {
|
|||
{
|
||||
.name = "AC97 HiFi",
|
||||
.stream_name = "AC97 HiFi",
|
||||
.cpu_dai_name = "pxa-ac97.0",
|
||||
.cpu_dai_name = "pxa2xx-ac97",
|
||||
.codec_dai_name = "wm9712-hifi",
|
||||
.codec_name = "wm9712-codec",
|
||||
.platform_name = "pxa-pcm-audio",
|
||||
|
@ -141,7 +141,7 @@ static struct snd_soc_dai_link palm27x_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",
|
||||
.codec_name = "wm9712-codec",
|
||||
.platform_name = "pxa-pcm-audio",
|
||||
|
|
|
@ -219,7 +219,7 @@ static struct snd_soc_dai_link tosa_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",
|
||||
|
@ -229,7 +229,7 @@ static struct snd_soc_dai_link tosa_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",
|
||||
|
|
|
@ -166,7 +166,7 @@ static struct snd_soc_dai_link zylonite_dai[] = {
|
|||
.stream_name = "AC97 HiFi",
|
||||
.codec_name = "wm9713-codec",
|
||||
.platform_name = "pxa-pcm-audio",
|
||||
.cpu_dai_name = "pxa-ac97.0",
|
||||
.cpu_dai_name = "pxa2xx-ac97",
|
||||
.codec_name = "wm9713-hifi",
|
||||
.init = zylonite_wm9713_init,
|
||||
},
|
||||
|
@ -175,7 +175,7 @@ static struct snd_soc_dai_link zylonite_dai[] = {
|
|||
.stream_name = "AC97 Aux",
|
||||
.codec_name = "wm9713-codec",
|
||||
.platform_name = "pxa-pcm-audio",
|
||||
.cpu_dai_name = "pxa-ac97.1",
|
||||
.cpu_dai_name = "pxa2xx-ac97-aux",
|
||||
.codec_name = "wm9713-aux",
|
||||
},
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue