diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-02-15 18:57:32 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-02-15 18:57:37 +0300 |
| commit | 471864ac8a3274106e0bf3a3e2119c282b76c062 (patch) | |
| tree | 70a78630af16e5374ddfe9f5626750bf8bf60a7f /sound/pci/hda/Kconfig | |
| parent | 8e8bc5000328a1ba8f93d43faf427e8ac31fb416 (diff) | |
| parent | 41c25e193b2befc22462aa41591d397fab174ca1 (diff) | |
| download | linux-471864ac8a3274106e0bf3a3e2119c282b76c062.tar.xz | |
Merge branch 'for-linus' into for-next
Pull the latest 6.8 stuff into devel branch for further development.
Fixed the trivial merge conflict for HD-audio Realtek stuff.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/Kconfig')
| -rw-r--r-- | sound/pci/hda/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig index 20d757e38f94..26da739eea82 100644 --- a/sound/pci/hda/Kconfig +++ b/sound/pci/hda/Kconfig @@ -159,7 +159,7 @@ config SND_HDA_SCODEC_CS35L56_I2C depends on I2C depends on ACPI || COMPILE_TEST depends on SND_SOC - select CS_DSP + select FW_CS_DSP select SND_HDA_GENERIC select SND_SOC_CS35L56_SHARED select SND_HDA_SCODEC_CS35L56 @@ -174,7 +174,7 @@ config SND_HDA_SCODEC_CS35L56_SPI depends on SPI_MASTER depends on ACPI || COMPILE_TEST depends on SND_SOC - select CS_DSP + select FW_CS_DSP select SND_HDA_GENERIC select SND_SOC_CS35L56_SHARED select SND_HDA_SCODEC_CS35L56 |