diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-11-12 20:50:22 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-11-12 20:50:22 +0100 |
| commit | c4211c9c342d0421d83765ca57fc36e030be4b5f (patch) | |
| tree | 817aa50779315944427a05027a5a5ab7d47107ec /kernel-i686-fedora.config | |
| parent | a223d454774cc181f1229969af0895d9242ffb50 (diff) | |
| parent | f1879fd534d196a61d446b0d3f70bd3e804390df (diff) | |
| download | kernel-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-i686-fedora.config')
| -rw-r--r-- | kernel-i686-fedora.config | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index bbda751b0..bd509a1cb 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -2548,7 +2548,6 @@ CONFIG_INTEL_IOATDMA=m # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set CONFIG_INTEL_IOMMU_FLOPPY_WA=y CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON=y -CONFIG_INTEL_IOMMU_SVM=y CONFIG_INTEL_IOMMU=y CONFIG_INTEL_IPS=m CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER=m @@ -4870,8 +4869,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 @@ -5857,7 +5856,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 |