]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Revert "ALSA: hda: cs35l41: Allow compilation test on non-ACPI configurations"
authorTakashi Iwai <tiwai@suse.de>
Fri, 15 Jul 2022 18:24:27 +0000 (20:24 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 15 Jul 2022 18:25:13 +0000 (20:25 +0200)
Since the recent change in CS35L41 codec requires the reference of
acpi_dev handle, the current Kconfig may lead to a build breakage.

Revert the Kconfig change and re-introduce the hard dependency on
CONFIG_ACPI again as a temporary workaround.

Fixes: ed6b661eb482 ("ALSA: hda: cs35l41: Support reading subsystem id from ACPI")
Link: https://lore.kernel.org/r/20220715182427.18891-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/Kconfig

index 44c33bc0740e078e63c6476974a9baa44c1637d6..a8e8cf98befa1ccd41dddc584b41bc0dd0c9c606 100644 (file)
@@ -103,7 +103,7 @@ config SND_HDA_CS_DSP_CONTROLS
 config SND_HDA_SCODEC_CS35L41_I2C
        tristate "Build CS35L41 HD-audio side codec support for I2C Bus"
        depends on I2C
-       depends on ACPI || COMPILE_TEST
+       depends on ACPI
        depends on SND_SOC
        select SND_SOC_CS35L41_LIB
        select SND_HDA_SCODEC_CS35L41
@@ -118,7 +118,7 @@ comment "Set to Y if you want auto-loading the side codec driver"
 config SND_HDA_SCODEC_CS35L41_SPI
        tristate "Build CS35L41 HD-audio codec support for SPI Bus"
        depends on SPI_MASTER
-       depends on ACPI || COMPILE_TEST
+       depends on ACPI
        depends on SND_SOC
        select SND_SOC_CS35L41_LIB
        select SND_HDA_SCODEC_CS35L41