summaryrefslogtreecommitdiff
path: root/sound/soc/samsung/s3c24xx_uda134x.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-25 18:19:29 +0300
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-25 18:19:29 +0300
commit16f9e062a70a81f5fcb597fbc2b8e8a0727a83ff (patch)
tree075e45485d7bf0bf5d8a03f35b013a1bd512f960 /sound/soc/samsung/s3c24xx_uda134x.c
parent0d42e6e77f8b872483833a7146286edaaaeb2f39 (diff)
parenta3adfa00e8089aa72826c6ba04bcb18cfceaf0a9 (diff)
downloadlinux-16f9e062a70a81f5fcb597fbc2b8e8a0727a83ff.tar.xz
Merge branch 'for-2.6.38' into for-2.6.39
Diffstat (limited to 'sound/soc/samsung/s3c24xx_uda134x.c')
-rw-r--r--sound/soc/samsung/s3c24xx_uda134x.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/samsung/s3c24xx_uda134x.c b/sound/soc/samsung/s3c24xx_uda134x.c
index ce749a10ec07..3cb700751078 100644
--- a/sound/soc/samsung/s3c24xx_uda134x.c
+++ b/sound/soc/samsung/s3c24xx_uda134x.c
@@ -221,7 +221,7 @@ static struct snd_soc_dai_link s3c24xx_uda134x_dai_link = {
.stream_name = "UDA134X",
.codec_name = "uda134x-hifi",
.codec_dai_name = "uda134x-hifi",
- .cpu_dai_name = "s3c24xx-i2s",
+ .cpu_dai_name = "s3c24xx-iis",
.ops = &s3c24xx_uda134x_ops,
.platform_name = "samsung-audio",
};