diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-12-04 15:04:41 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-12-04 15:04:41 +0100 |
| commit | 3ac1f00ad4ce5a99b1577ce7dec202c7628f60c6 (patch) | |
| tree | 86173a65443a1477b28f133be952ff52c5f581bb /kernel-x86_64-fedora.config | |
| parent | 2a1c0538d5e8b5cc934663b04c4ce37225b4fd07 (diff) | |
| parent | 00b08d5bdf7f347142ace2dc4b0d44e9f2499825 (diff) | |
| download | kernel-3ac1f00ad4ce5a99b1577ce7dec202c7628f60c6.tar.gz kernel-3ac1f00ad4ce5a99b1577ce7dec202c7628f60c6.tar.xz kernel-3ac1f00ad4ce5a99b1577ce7dec202c7628f60c6.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.10.0-0.rc6.20201204git34816d20f173.92.vanilla.1.fc34kernel-5.10.0-0.rc6.20201204git34816d20f173.92.vanilla.1.fc33kernel-5.10.0-0.rc6.20201204git34816d20f173.92.vanilla.1.fc32
Diffstat (limited to 'kernel-x86_64-fedora.config')
| -rw-r--r-- | kernel-x86_64-fedora.config | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index fc3ff0194..499d82d39 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -5871,7 +5871,6 @@ CONFIG_SND_SOC_HDAC_HDA=m CONFIG_SND_SOC_HDAC_HDMI=m CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_IMG is not set -# CONFIG_SND_SOC_IMX_AUDMIX is not set # CONFIG_SND_SOC_IMX_AUDMUX is not set # CONFIG_SND_SOC_IMX_ES8328 is not set # CONFIG_SND_SOC_INNO_RK3036 is not set @@ -5916,7 +5915,7 @@ CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m -# CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is not set +CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m CONFIG_SND_SOC_INTEL_SST_ACPI=m CONFIG_SND_SOC_INTEL_SST=m CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y |