diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-25 15:19:29 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-25 15:19:29 +0000 |
| commit | 16f9e062a70a81f5fcb597fbc2b8e8a0727a83ff (patch) | |
| tree | 075e45485d7bf0bf5d8a03f35b013a1bd512f960 /sound/soc/samsung/neo1973_wm8753.c | |
| parent | 0d42e6e77f8b872483833a7146286edaaaeb2f39 (diff) | |
| parent | a3adfa00e8089aa72826c6ba04bcb18cfceaf0a9 (diff) | |
| download | blackbird-op-linux-16f9e062a70a81f5fcb597fbc2b8e8a0727a83ff.tar.gz blackbird-op-linux-16f9e062a70a81f5fcb597fbc2b8e8a0727a83ff.zip | |
Merge branch 'for-2.6.38' into for-2.6.39
Diffstat (limited to 'sound/soc/samsung/neo1973_wm8753.c')
| -rw-r--r-- | sound/soc/samsung/neo1973_wm8753.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/samsung/neo1973_wm8753.c b/sound/soc/samsung/neo1973_wm8753.c index c7a24514beb5..d20815d5ab2e 100644 --- a/sound/soc/samsung/neo1973_wm8753.c +++ b/sound/soc/samsung/neo1973_wm8753.c @@ -559,9 +559,9 @@ static struct snd_soc_dai_link neo1973_dai[] = { .name = "WM8753", .stream_name = "WM8753 HiFi", .platform_name = "samsung-audio", - .cpu_dai_name = "s3c24xx-i2s", + .cpu_dai_name = "s3c24xx-iis", .codec_dai_name = "wm8753-hifi", - .codec_name = "wm8753-codec.0-0x1a", + .codec_name = "wm8753-codec.0-001a", .init = neo1973_wm8753_init, .ops = &neo1973_hifi_ops, }, @@ -571,7 +571,7 @@ static struct snd_soc_dai_link neo1973_dai[] = { .platform_name = "samsung-audio", .cpu_dai_name = "bluetooth-dai", .codec_dai_name = "wm8753-voice", - .codec_name = "wm8753-codec.0-0x1a", + .codec_name = "wm8753-codec.0-001a", .ops = &neo1973_voice_ops, }, }; |
