diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-08-16 09:10:19 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-08-16 09:10:19 +0200 |
| commit | 01d5500f35ad97887d786af03486d03e67965a6d (patch) | |
| tree | ef5d79e50eafb2eb5b0228a5961b74eef3f1c215 /sound/soc/intel/sst-acpi.c | |
| parent | 61074c1a2d798be90e149a9ed4ce0e3596c00a38 (diff) | |
| parent | 7c063edee6855a2489f995578f6c7a4ab0ddfe07 (diff) | |
Merge tag 'asoc-v3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.17
Nothing too exciting here, a bunch of driver fixes that came along since
the initial pull request but none that really stand our and a warning
fix in the core.
Diffstat (limited to 'sound/soc/intel/sst-acpi.c')
| -rw-r--r-- | sound/soc/intel/sst-acpi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/intel/sst-acpi.c b/sound/soc/intel/sst-acpi.c index 42edc6f4fc4a..03d0a166b635 100644 --- a/sound/soc/intel/sst-acpi.c +++ b/sound/soc/intel/sst-acpi.c @@ -246,8 +246,8 @@ static struct sst_acpi_desc sst_acpi_broadwell_desc = { }; static struct sst_acpi_mach baytrail_machines[] = { - { "10EC5640", "byt-rt5640", "intel/fw_sst_0f28.bin-i2s_master" }, - { "193C9890", "byt-max98090", "intel/fw_sst_0f28.bin-i2s_master" }, + { "10EC5640", "byt-rt5640", "intel/fw_sst_0f28.bin-48kHz_i2s_master" }, + { "193C9890", "byt-max98090", "intel/fw_sst_0f28.bin-48kHz_i2s_master" }, {} }; |