summaryrefslogtreecommitdiffstats
path: root/kernel-x86_64-fedora.config
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-11-12 20:50:22 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2020-11-12 20:50:22 +0100
commitc4211c9c342d0421d83765ca57fc36e030be4b5f (patch)
tree817aa50779315944427a05027a5a5ab7d47107ec /kernel-x86_64-fedora.config
parenta223d454774cc181f1229969af0895d9242ffb50 (diff)
parentf1879fd534d196a61d446b0d3f70bd3e804390df (diff)
downloadkernel-c4211c9c342d0421d83765ca57fc36e030be4b5f.tar.gz
kernel-c4211c9c342d0421d83765ca57fc36e030be4b5f.tar.xz
kernel-c4211c9c342d0421d83765ca57fc36e030be4b5f.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.10.0-0.rc3.20201112git3d5e28bff7ad.73.vanilla.1.fc33
Diffstat (limited to 'kernel-x86_64-fedora.config')
-rw-r--r--kernel-x86_64-fedora.config6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 726192907..91405eac4 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -4911,8 +4911,8 @@ CONFIG_REGULATOR_MP886X=m
# CONFIG_REGULATOR_PV88090 is not set
# CONFIG_REGULATOR_PWM is not set
# CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
-# CONFIG_REGULATOR_RT4801 is not set
-# CONFIG_REGULATOR_RTMV20 is not set
+CONFIG_REGULATOR_RT4801=m
+CONFIG_REGULATOR_RTMV20=m
# CONFIG_REGULATOR_SLG51000 is not set
# CONFIG_REGULATOR_SY8106A is not set
# CONFIG_REGULATOR_SY8824X is not set
@@ -5907,7 +5907,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=m
+# CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is not set
CONFIG_SND_SOC_INTEL_SST_ACPI=m
CONFIG_SND_SOC_INTEL_SST=m
CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y