diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-05-30 21:26:19 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-05-30 21:26:19 +0200 |
| commit | e1e287e6f9de7e43716438f4c131eeb4a0be65b7 (patch) | |
| tree | 7d812ab8f3b3819f40cf838b31c3c2f1597626ee /sound/soc/intel | |
| parent | 700fe6fd093d08c6da2bda8efe00479b0e617327 (diff) | |
| parent | c85578e730135d47271ca874e4436dd87e87f252 (diff) | |
Merge tag 'asoc-fix-v6.10-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.10
Several serieses of fixes that have come in since the merge window,
mostly for Intel systems. The biggest thing is some updates from Peter
which fix support for a series of Intel laptops which have been found to
use 16 bit rather than 32 bit DMIC configuration blobs in their firmware
descriptions. We also have a bunch of fixes for module annotations, and
some smaller single patch fixes.
Diffstat (limited to 'sound/soc/intel')
| -rw-r--r-- | sound/soc/intel/boards/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig index 3ed81ab649c5..4e0586034de4 100644 --- a/sound/soc/intel/boards/Kconfig +++ b/sound/soc/intel/boards/Kconfig @@ -652,7 +652,7 @@ if SND_SOC_SOF_INTEL_SOUNDWIRE config SND_SOC_INTEL_SOUNDWIRE_SOF_MACH tristate "SoundWire generic machine driver" - depends on I2C && ACPI + depends on I2C && SPI_MASTER && ACPI depends on MFD_INTEL_LPSS || COMPILE_TEST depends on SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES || COMPILE_TEST depends on SOUNDWIRE |