projects/linux·commit deb08737

Merge tag 'asoc-fix-intel-v3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

deb08737 · Takashi Iwai <[email protected]> · 2015-02-05 21:30:43 +01:00

ASoC: Fix for Intel firmware name

Another one liner that arrived after the earlier pull request.  There's
a trivial conflict with my -next branch, I'll send a pull request with
that resolution and some other new stuff before Monday.
Commit
deb08737e7ad6545e0fe19263f9221ecfdcfdd9f
Parents
08c191de · 5c2b0636

Merge commit. Changes below are compared with the first parent: 08c191de.

Changes

1 files changed · +1 −1

FileStatusAddDelContent
sound/soc/intel/sst/sst_acpi.cmodified+1−1View file

sound/soc/intel/sst/sst_acpi.c

View file
diff --git a/sound/soc/intel/sst/sst_acpi.c b/sound/soc/intel/sst/sst_acpi.c
index 2ac72eb..b336013 100644
--- a/sound/soc/intel/sst/sst_acpi.c
+++ b/sound/soc/intel/sst/sst_acpi.c
@@ -350,7 +350,7 @@ static struct sst_machines sst_acpi_bytcr[] = {
/* Cherryview-based platforms: CherryTrail and Braswell */
static struct sst_machines sst_acpi_chv[] = {
- {"10EC5670", "cht-bsw", "cht-bsw-rt5672", NULL, "fw_sst_22a8.bin",
+ {"10EC5670", "cht-bsw", "cht-bsw-rt5672", NULL, "intel/fw_sst_22a8.bin",
&chv_platform_data },
{},
};