diff options
| author | Mark Brown <broonie@kernel.org> | 2020-04-14 18:04:08 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-04-14 18:04:08 +0100 |
| commit | 39400f34a289ad5f5f0b36b8bb4591603b73a759 (patch) | |
| tree | e53a1b674ceaaac044037e03545952dddf8cdeaf /sound/soc/intel | |
| parent | 5c5118dc5d14e1d7864bddade30019660cb467fa (diff) | |
| parent | 2a79c31a498e002eeb7c7d759241c3cca95b28d9 (diff) | |
| download | linux-stable-39400f34a289ad5f5f0b36b8bb4591603b73a759.tar.gz linux-stable-39400f34a289ad5f5f0b36b8bb4591603b73a759.tar.bz2 linux-stable-39400f34a289ad5f5f0b36b8bb4591603b73a759.zip | |
Merge branch 'asoc-5.7' into asoc-5.8
Diffstat (limited to 'sound/soc/intel')
| -rw-r--r-- | sound/soc/intel/common/soc-acpi-intel-cml-match.c | 8 | ||||
| -rw-r--r-- | sound/soc/intel/common/soc-acpi-intel-icl-match.c | 8 |
2 files changed, 0 insertions, 16 deletions
diff --git a/sound/soc/intel/common/soc-acpi-intel-cml-match.c b/sound/soc/intel/common/soc-acpi-intel-cml-match.c index bcedec6c6117..7d85bd5aff9f 100644 --- a/sound/soc/intel/common/soc-acpi-intel-cml-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-cml-match.c @@ -113,14 +113,6 @@ static const struct snd_soc_acpi_adr_device rt1308_1_adr[] = { } }; -static const struct snd_soc_acpi_adr_device rt1308_2_adr[] = { - { - .adr = 0x000210025D130800, - .num_endpoints = 1, - .endpoints = &single_endpoint, - } -}; - static const struct snd_soc_acpi_adr_device rt1308_1_group1_adr[] = { { .adr = 0x000110025D130800, diff --git a/sound/soc/intel/common/soc-acpi-intel-icl-match.c b/sound/soc/intel/common/soc-acpi-intel-icl-match.c index ef8500349f2f..16ec9f382b0f 100644 --- a/sound/soc/intel/common/soc-acpi-intel-icl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-icl-match.c @@ -87,14 +87,6 @@ static const struct snd_soc_acpi_adr_device rt1308_1_adr[] = { } }; -static const struct snd_soc_acpi_adr_device rt1308_2_adr[] = { - { - .adr = 0x000210025D130800, - .num_endpoints = 1, - .endpoints = &single_endpoint, - } -}; - static const struct snd_soc_acpi_adr_device rt1308_1_group1_adr[] = { { .adr = 0x000110025D130800, |