diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-02 04:35:05 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-02 04:35:05 (GMT) |
| commit | 723b4cb5d1d3ad4d0f70627ba502f566793795f6 (patch) | |
| tree | f836e8c10c605058561750b196ee12b5c8190252 /sound/soc/fsl/pcm030-audio-fabric.c | |
| parent | 546694bc42a4ee4f1a5d2f14e1c71d11fdafba4d (diff) | |
| parent | 29df430692c46b8c434ce172a6f127945b475b95 (diff) | |
| download | linux-723b4cb5d1d3ad4d0f70627ba502f566793795f6.tar.xz | |
Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next
Diffstat (limited to 'sound/soc/fsl/pcm030-audio-fabric.c')
| -rw-r--r-- | sound/soc/fsl/pcm030-audio-fabric.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/fsl/pcm030-audio-fabric.c b/sound/soc/fsl/pcm030-audio-fabric.c index 4b63ec8..4d26192 100644 --- a/sound/soc/fsl/pcm030-audio-fabric.c +++ b/sound/soc/fsl/pcm030-audio-fabric.c @@ -29,14 +29,14 @@ struct pcm030_audio_data { static struct snd_soc_dai_link pcm030_fabric_dai[] = { { - .name = "AC97", + .name = "AC97.0", .stream_name = "AC97 Analog", .codec_dai_name = "wm9712-hifi", .cpu_dai_name = "mpc5200-psc-ac97.0", .codec_name = "wm9712-codec", }, { - .name = "AC97", + .name = "AC97.1", .stream_name = "AC97 IEC958", .codec_dai_name = "wm9712-aux", .cpu_dai_name = "mpc5200-psc-ac97.1", |