This reverts commit 6b8b6892e43419f5339c47d307b1baac0eea036d.
Report from kernel test robot <lkp@xxxxxxxxx>, that
in broonie/ci.git file0yZ50U, it's redundant
commit 6b8b6892e434 ("ASoC: Intel: Add rpl_nau8318_8825 driver")
because commit 273bc8bf2227 ("ASoC: Intel: Add rpl_nau8318_8825 driver")
was committed at 2023-08-14.
All errors (new ones prefixed by >>):
>> sound/soc/intel/common/soc-acpi-intel-rpl-match.c:369:41: error: redefinition of 'rpl_nau8318_amp'
static const struct snd_soc_acpi_codecs rpl_nau8318_amp = {
^
sound/soc/intel/common/soc-acpi-intel-rpl-match.c:359:41: note: previous definition is here
static const struct snd_soc_acpi_codecs rpl_nau8318_amp = {
Reported-by: kernel test robot <lkp@xxxxxxxxx>
Closes: https://lore.kernel.org/oe-kbuild-all/202308221955.FkglAuTF-lkp@xxxxxxxxx/
Signed-off-by: Ajye Huang <ajye_huang@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
---
sound/soc/intel/common/soc-acpi-intel-rpl-match.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c
index 103490ac7c838..122673c1dae27 100644
--- a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c
@@ -366,11 +366,6 @@ static const struct snd_soc_acpi_codecs rpl_rt1019p_amp = {
.codecs = {"RTL1019"}
};
-static const struct snd_soc_acpi_codecs rpl_nau8318_amp = {
- .num_codecs = 1,
- .codecs = {"NVTN2012"}
-};
-
struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[] = {
{
.comp_ids = &rpl_rt5682_hp,
--
2.25.1
