diff options
| author | Randy Dunlap <randy.dunlap@oracle.com> | 2011-05-20 18:10:04 +0200 |
|---|---|---|
| committer | Randy Dunlap <randy.dunlap@oracle.com> | 2011-05-20 18:10:04 +0200 |
| commit | 2f3e4af471e38e0658e701973238ae4b5e50fcd6 (patch) | |
| tree | fbfc99c0d975e38ff80f4ff3239a9fc0567b8a4d /sound/soc/samsung/goni_wm8994.c | |
| parent | Correct occurrences of (diff) | |
| parent | Create Documentation/security/, (diff) | |
| download | linux-2f3e4af471e38e0658e701973238ae4b5e50fcd6.tar.xz linux-2f3e4af471e38e0658e701973238ae4b5e50fcd6.zip | |
Merge branch 'docs-security' into docs-move
Diffstat (limited to 'sound/soc/samsung/goni_wm8994.c')
| -rw-r--r-- | sound/soc/samsung/goni_wm8994.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/samsung/goni_wm8994.c b/sound/soc/samsung/goni_wm8994.c index f6b3a3ce5919..0e80daee8b6f 100644 --- a/sound/soc/samsung/goni_wm8994.c +++ b/sound/soc/samsung/goni_wm8994.c @@ -236,18 +236,18 @@ static struct snd_soc_dai_link goni_dai[] = { .name = "WM8994", .stream_name = "WM8994 HiFi", .cpu_dai_name = "samsung-i2s.0", - .codec_dai_name = "wm8994-hifi", + .codec_dai_name = "wm8994-aif1", .platform_name = "samsung-audio", - .codec_name = "wm8994-codec.0-0x1a", + .codec_name = "wm8994-codec.0-001a", .init = goni_wm8994_init, .ops = &goni_hifi_ops, }, { .name = "WM8994 Voice", .stream_name = "Voice", .cpu_dai_name = "goni-voice-dai", - .codec_dai_name = "wm8994-voice", + .codec_dai_name = "wm8994-aif2", .platform_name = "samsung-audio", - .codec_name = "wm8994-codec.0-0x1a", + .codec_name = "wm8994-codec.0-001a", .ops = &goni_voice_ops, }, }; |