diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-02-05 21:30:43 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-02-05 21:30:43 +0100 |
| commit | deb08737e7ad6545e0fe19263f9221ecfdcfdd9f (patch) | |
| tree | 673ffdfdea886aabe1169db0d2284eb7178fce0e /sound | |
| parent | 08c191de948d6cd9dc613db0683e2467ce44a18c (diff) | |
| parent | 5c2b06369dafd796ebb4f17dab543d3da500245e (diff) | |
| download | op-kernel-dev-deb08737e7ad6545e0fe19263f9221ecfdcfdd9f.zip op-kernel-dev-deb08737e7ad6545e0fe19263f9221ecfdcfdd9f.tar.gz | |
Merge tag 'asoc-fix-intel-v3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/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.
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/intel/sst/sst_acpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 }, {}, }; |
