Commit deb08737e7ad6545e0fe19263f9221ecfdcfdd9f
Exists in
ti-lsk-linux-4.1.y
and in
10 other branches
Merge tag 'asoc-fix-intel-v3.19-rc7' of git://git.kernel.org/pub/scm/linux/kerne…
…l/git/broonie/sound into for-linus 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.
Showing 1 changed file Side-by-side Diff
sound/soc/intel/sst/sst_acpi.c
| ... | ... | @@ -350,7 +350,7 @@ |
| 350 | 350 | |
| 351 | 351 | /* Cherryview-based platforms: CherryTrail and Braswell */ |
| 352 | 352 | static struct sst_machines sst_acpi_chv[] = { |
| 353 | - {"10EC5670", "cht-bsw", "cht-bsw-rt5672", NULL, "fw_sst_22a8.bin", | |
| 353 | + {"10EC5670", "cht-bsw", "cht-bsw-rt5672", NULL, "intel/fw_sst_22a8.bin", | |
| 354 | 354 | &chv_platform_data }, |
| 355 | 355 | {}, |
| 356 | 356 | }; |