diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-16 09:26:41 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-16 09:30:56 +0900 |
| commit | c3c9b370ea4fa2566dfb0c3d88d9f02be0533e7a (patch) | |
| tree | b1c0803a13255e6c5117b8a6c0c4d5ecac3373d3 /sound | |
| parent | 6268f74990c7fab6727bcb2dc82b3c4d4b302317 (diff) | |
| download | linux-stable-c3c9b370ea4fa2566dfb0c3d88d9f02be0533e7a.tar.gz linux-stable-c3c9b370ea4fa2566dfb0c3d88d9f02be0533e7a.tar.bz2 linux-stable-c3c9b370ea4fa2566dfb0c3d88d9f02be0533e7a.zip | |
ASoC: bells: Fix up git patch application failure
It seems git has been getting confused by the very similar contexts
for the speaker DAIs and has been applying patches to the wrong places
causing all sorts of confusion. Fix this up by hand.
Reported-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/samsung/bells.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/samsung/bells.c b/sound/soc/samsung/bells.c index b56b9a3c6169..a2ca1567b9e4 100644 --- a/sound/soc/samsung/bells.c +++ b/sound/soc/samsung/bells.c @@ -212,7 +212,7 @@ static struct snd_soc_dai_link bells_dai_wm5102[] = { { .name = "Sub", .stream_name = "Sub", - .cpu_dai_name = "wm5110-aif3", + .cpu_dai_name = "wm5102-aif3", .codec_dai_name = "wm9081-hifi", .codec_name = "wm9081.1-006c", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF @@ -247,7 +247,7 @@ static struct snd_soc_dai_link bells_dai_wm5110[] = { { .name = "Sub", .stream_name = "Sub", - .cpu_dai_name = "wm5102-aif3", + .cpu_dai_name = "wm5110-aif3", .codec_dai_name = "wm9081-hifi", .codec_name = "wm9081.1-006c", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |