diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-09-14 10:16:12 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-09-14 10:16:12 +0200 |
| commit | 64c0ce555ad2d84f497f5f584ddd31e87ac690a2 (patch) | |
| tree | 36413d636cc2f09bbec2a00036550b87d88724d9 /sound/soc/intel | |
| parent | Merge tag 'asoc-v6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/bro... (diff) | |
| parent | Merge tag 'asoc-fix-v6.11-rc7' of https://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| download | linux-64c0ce555ad2d84f497f5f584ddd31e87ac690a2.tar.xz linux-64c0ce555ad2d84f497f5f584ddd31e87ac690a2.zip | |
Merge branch 'for-linus' into for-next
Pull 6.11 fixes to 6.12-devel branch
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/intel')
| -rw-r--r-- | sound/soc/intel/common/soc-acpi-intel-lnl-match.c | 1 | ||||
| -rw-r--r-- | sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/intel/common/soc-acpi-intel-lnl-match.c b/sound/soc/intel/common/soc-acpi-intel-lnl-match.c index 2522e6f11749..3c4e0c7ca8ee 100644 --- a/sound/soc/intel/common/soc-acpi-intel-lnl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-lnl-match.c @@ -267,6 +267,7 @@ static const struct snd_soc_acpi_link_adr lnl_cs42l43_l0[] = { .num_adr = ARRAY_SIZE(cs42l43_0_adr), .adr_d = cs42l43_0_adr, }, + {} }; static const struct snd_soc_acpi_link_adr lnl_cs42l43_l0_cs35l56_l3[] = { diff --git a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c index 8e0ae3635a35..d4435a34a3a3 100644 --- a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c @@ -674,6 +674,7 @@ static const struct snd_soc_acpi_link_adr mtl_cs42l43_l0[] = { .num_adr = ARRAY_SIZE(cs42l43_0_adr), .adr_d = cs42l43_0_adr, }, + {} }; static const struct snd_soc_acpi_link_adr mtl_cs42l43_cs35l56[] = { |