diff options
| author | Liam Girdwood <lrg@slimlogic.co.uk> | 2010-08-23 12:58:01 +0100 |
|---|---|---|
| committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2010-08-23 12:58:01 +0100 |
| commit | 97e15b1fcf79a60cb146d4123e7c72ac2736e258 (patch) | |
| tree | 5923cd4d4f2e1945b66a7aab27acf684f8590c47 /sound/soc/omap | |
| parent | a8165e0e6f0511d14132423b4bce2d285e890fc8 (diff) | |
| parent | 38fec7272bc033b75a0eb8976c56c2024d371b7d (diff) | |
| download | kernel_samsung_aries-97e15b1fcf79a60cb146d4123e7c72ac2736e258.zip kernel_samsung_aries-97e15b1fcf79a60cb146d4123e7c72ac2736e258.tar.gz kernel_samsung_aries-97e15b1fcf79a60cb146d4123e7c72ac2736e258.tar.bz2 | |
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 9d88efa..438146a 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 = { .name = "CX20442", .stream_name = "CX20442", .cpu_dai_name ="omap-mcbsp-dai.0", - .codec_dai_name = "cx20442-hifi", + .codec_dai_name = "cx20442-voice", .init = ams_delta_cx20442_init, .platform_name = "omap-pcm-audio", .codec_name = "cx20442-codec", |