diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2022-03-30 14:04:22 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2022-03-30 14:04:22 +0200 |
| commit | 21b5954d61fd467d0c4e25583845ba0621dfb4fb (patch) | |
| tree | 7ad99d39463e6ce50184d65361099137d37c8409 /sound/soc/sof | |
| parent | ALSA: hda: Avoid unsol event during RPM suspending (diff) | |
| parent | ASoC: SOF: Intel: Fix build error without SND_SOC_SOF_PCI_DEV (diff) | |
| download | linux-dev-21b5954d61fd467d0c4e25583845ba0621dfb4fb.tar.xz linux-dev-21b5954d61fd467d0c4e25583845ba0621dfb4fb.zip | |
Merge tag 'asoc-fix-v5.18' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.18
A few fixes that came in during the merge window, all fairly routine.
Diffstat (limited to 'sound/soc/sof')
| -rw-r--r-- | sound/soc/sof/intel/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig index b53f216d4ecc..172419392b33 100644 --- a/sound/soc/sof/intel/Kconfig +++ b/sound/soc/sof/intel/Kconfig @@ -84,6 +84,7 @@ if SND_SOC_SOF_PCI config SND_SOC_SOF_MERRIFIELD tristate "SOF support for Tangier/Merrifield" default SND_SOC_SOF_PCI + select SND_SOC_SOF_PCI_DEV select SND_SOC_SOF_INTEL_ATOM_HIFI_EP help This adds support for Sound Open Firmware for Intel(R) platforms |