diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-04 00:27:42 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-04 00:27:42 -0500 |
| commit | 0a0e9ae1bd788bc19adc4d4ae08c98b233697402 (patch) | |
| tree | 13825eeb5bbeae27d66e95f12168eff4b60701ab /sound/soc/pxa/e740_wm9705.c | |
| parent | 01a16b21d6adf992aa863186c3c4e561a57c1714 (diff) | |
| parent | b65a0e0c84cf489bfa00d6aa6c48abc5a237100f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x/bnx2x.h
Diffstat (limited to 'sound/soc/pxa/e740_wm9705.c')
| -rw-r--r-- | sound/soc/pxa/e740_wm9705.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/pxa/e740_wm9705.c b/sound/soc/pxa/e740_wm9705.c index 28333e7d9c50..dc65650a6fa1 100644 --- a/sound/soc/pxa/e740_wm9705.c +++ b/sound/soc/pxa/e740_wm9705.c | |||
| @@ -117,7 +117,7 @@ static struct snd_soc_dai_link e740_dai[] = { | |||
| 117 | { | 117 | { |
| 118 | .name = "AC97", | 118 | .name = "AC97", |
| 119 | .stream_name = "AC97 HiFi", | 119 | .stream_name = "AC97 HiFi", |
| 120 | .cpu_dai_name = "pxa-ac97.0", | 120 | .cpu_dai_name = "pxa2xx-ac97", |
| 121 | .codec_dai_name = "wm9705-hifi", | 121 | .codec_dai_name = "wm9705-hifi", |
| 122 | .platform_name = "pxa-pcm-audio", | 122 | .platform_name = "pxa-pcm-audio", |
| 123 | .codec_name = "wm9705-codec", | 123 | .codec_name = "wm9705-codec", |
| @@ -126,7 +126,7 @@ static struct snd_soc_dai_link e740_dai[] = { | |||
| 126 | { | 126 | { |
| 127 | .name = "AC97 Aux", | 127 | .name = "AC97 Aux", |
| 128 | .stream_name = "AC97 Aux", | 128 | .stream_name = "AC97 Aux", |
| 129 | .cpu_dai_name = "pxa-ac97.1", | 129 | .cpu_dai_name = "pxa2xx-ac97-aux", |
| 130 | .codec_dai_name = "wm9705-aux", | 130 | .codec_dai_name = "wm9705-aux", |
| 131 | .platform_name = "pxa-pcm-audio", | 131 | .platform_name = "pxa-pcm-audio", |
| 132 | .codec_name = "wm9705-codec", | 132 | .codec_name = "wm9705-codec", |