summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2021-12-01 14:15:12 +0000
committerMark Brown <broonie@kernel.org>2021-12-01 14:15:12 +0000
commit67140b64b68395b79177efcd16a7530ed5311e49 (patch)
treeb1843f4e04d9c0f1d749add23f78ed2ddc84e7ed /include/sound
parentf316c9d9ba8ea08d6994bc5ba8fa276eab186208 (diff)
parent046aede2f847676f93a2ea4f48b77909c51dba40 (diff)
downloadlinux-67140b64b68395b79177efcd16a7530ed5311e49.tar.gz
linux-67140b64b68395b79177efcd16a7530ed5311e49.tar.bz2
linux-67140b64b68395b79177efcd16a7530ed5311e49.zip
Merge branch 'for-5.16' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.17 so we can apply new Tegra work
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/soc-acpi.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/soc-acpi.h b/include/sound/soc-acpi.h
index 31f4c4f9aeea..ac0893df9c76 100644
--- a/include/sound/soc-acpi.h
+++ b/include/sound/soc-acpi.h
@@ -147,7 +147,7 @@ struct snd_soc_acpi_link_adr {
*/
/* Descriptor for SST ASoC machine driver */
struct snd_soc_acpi_mach {
- const u8 id[ACPI_ID_LEN];
+ u8 id[ACPI_ID_LEN];
const struct snd_soc_acpi_codecs *comp_ids;
const u32 link_mask;
const struct snd_soc_acpi_link_adr *links;