diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-08-18 21:56:42 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-08-18 21:56:47 +0200 |
| commit | 8bc84f87315e8bdbe242ba788fdc6a74d653b177 (patch) | |
| tree | b96fef5c82de40cb2a5bfe6f29699f1c820513cd /sound/soc/samsung/jive_wm8750.c | |
| parent | 18e5a45db30e0e338cdd663eda05a8288cc14fa5 (diff) | |
| parent | fe4c51b22080691792d3e28d86acb4d4ccb7e8e8 (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge reason: add the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'sound/soc/samsung/jive_wm8750.c')
| -rw-r--r-- | sound/soc/samsung/jive_wm8750.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/samsung/jive_wm8750.c b/sound/soc/samsung/jive_wm8750.c index 3b53ad54bc3..14eb6ea69e7 100644 --- a/sound/soc/samsung/jive_wm8750.c +++ b/sound/soc/samsung/jive_wm8750.c @@ -131,7 +131,7 @@ static struct snd_soc_dai_link jive_dai = { .cpu_dai_name = "s3c2412-i2s", .codec_dai_name = "wm8750-hifi", .platform_name = "samsung-audio", - .codec_name = "wm8750-codec.0-0x1a", + .codec_name = "wm8750-codec.0-001a", .init = jive_wm8750_init, .ops = &jive_ops, }; |