diff options
| author | Liam Girdwood <lrg@slimlogic.co.uk> | 2010-08-23 07:58:01 -0400 |
|---|---|---|
| committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2010-08-23 07:58:01 -0400 |
| commit | 97e15b1fcf79a60cb146d4123e7c72ac2736e258 (patch) | |
| tree | 5923cd4d4f2e1945b66a7aab27acf684f8590c47 /sound/soc/omap | |
| parent | a8165e0e6f0511d14132423b4bce2d285e890fc8 (diff) | |
| parent | 38fec7272bc033b75a0eb8976c56c2024d371b7d (diff) | |
Merge remote branch 'broonie-asoc/for-2.6.37' into for-2.6.37
Diffstat (limited to 'sound/soc/omap')
| -rw-r--r-- | sound/soc/omap/ams-delta.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c index 9d88efa06e3c..438146addbb8 100644 --- a/sound/soc/omap/ams-delta.c +++ b/sound/soc/omap/ams-delta.c | |||
| @@ -584,7 +584,7 @@ static struct snd_soc_dai_link ams_delta_dai_link = { | |||
| 584 | .name = "CX20442", | 584 | .name = "CX20442", |
| 585 | .stream_name = "CX20442", | 585 | .stream_name = "CX20442", |
| 586 | .cpu_dai_name ="omap-mcbsp-dai.0", | 586 | .cpu_dai_name ="omap-mcbsp-dai.0", |
| 587 | .codec_dai_name = "cx20442-hifi", | 587 | .codec_dai_name = "cx20442-voice", |
| 588 | .init = ams_delta_cx20442_init, | 588 | .init = ams_delta_cx20442_init, |
| 589 | .platform_name = "omap-pcm-audio", | 589 | .platform_name = "omap-pcm-audio", |
| 590 | .codec_name = "cx20442-codec", | 590 | .codec_name = "cx20442-codec", |