diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-11-21 07:18:11 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-11-21 07:18:11 +0100 |
| commit | 789e05275e90b637f2029375715e187fd8cabbf4 (patch) | |
| tree | ac6f9626a60e81c8af28b11f67e09bde9e145f24 /sound/soc/samsung/bells.c | |
| parent | ALSA: hda - Limit runtime PM support only to known Intel chips (diff) | |
| parent | Merge branches 'fix/arizona', 'fix/cs4271', 'fix/kirkwood' and 'fix/samsung' ... (diff) | |
| download | linux-789e05275e90b637f2029375715e187fd8cabbf4.tar.xz linux-789e05275e90b637f2029375715e187fd8cabbf4.zip | |
Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.7
The biggest batch of fixes here is the Kirkwood DMA fixes, plus a couple
of other small fixes.
Diffstat (limited to 'sound/soc/samsung/bells.c')
| -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 |