diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-12-30 16:17:13 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-12-30 16:17:13 +0100 |
| commit | e83ce4a51757cf63970a76090662f636112231a7 (patch) | |
| tree | e1edaf29646eff64a3e94b2be77f7073ed8abb0d /sound/soc/intel/sst/sst_acpi.c | |
| parent | d6795827bd79b28fef1abdaf7e525fcca506b831 (diff) | |
| parent | f2ec1d3b25776051a9205289dab12e9401d33f8a (diff) | |
| download | op-kernel-dev-e83ce4a51757cf63970a76090662f636112231a7.zip op-kernel-dev-e83ce4a51757cf63970a76090662f636112231a7.tar.gz | |
Merge tag 'asoc-fix-v3.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.19
A few fixes for v3.19, a few driver specifics and one core fix which
fixes a boot crash on OMAP if deferred probing kicks in due to
attempting to modify static data.
Diffstat (limited to 'sound/soc/intel/sst/sst_acpi.c')
| -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 3abc29e..2ac72eb 100644 --- a/sound/soc/intel/sst/sst_acpi.c +++ b/sound/soc/intel/sst/sst_acpi.c @@ -343,7 +343,7 @@ int sst_acpi_remove(struct platform_device *pdev) } static struct sst_machines sst_acpi_bytcr[] = { - {"10EC5640", "T100", "bytt100_rt5640", NULL, "fw_sst_0f28.bin", + {"10EC5640", "T100", "bytt100_rt5640", NULL, "intel/fw_sst_0f28.bin", &byt_rvp_platform_data }, {}, }; |
