diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-04-08 06:27:25 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-04-08 06:27:25 +0200 |
commit | c9ee4971d9f95f495cb9645851e8d47073ae0e20 (patch) | |
tree | 7f00dc8f1f498e2e9ab41689496a966159670700 /kernel-x86_64-rhel.config | |
parent | 3bb63fa7872e911bdf13d1822719f83310fab24d (diff) | |
parent | 2db8df88f66eacaa9bec1995431388fb3a044566 (diff) | |
download | kernel-c9ee4971d9f95f495cb9645851e8d47073ae0e20.tar.gz kernel-c9ee4971d9f95f495cb9645851e8d47073ae0e20.tar.xz kernel-c9ee4971d9f95f495cb9645851e8d47073ae0e20.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.12.0-0.rc6.20210407git2d743660786e.185.vanilla.1.fc34
Diffstat (limited to 'kernel-x86_64-rhel.config')
-rw-r--r-- | kernel-x86_64-rhel.config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index efffd6687..9115709c8 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -2062,7 +2062,7 @@ CONFIG_I2C_NFORCE2_S4985=m # CONFIG_I2C_NOMADIK is not set # CONFIG_I2C_NVIDIA_GPU is not set # CONFIG_I2C_OCORES is not set -CONFIG_I2C_PARPORT_LIGHT=m +# CONFIG_I2C_PARPORT_LIGHT is not set CONFIG_I2C_PARPORT=m CONFIG_I2C_PCA_PLATFORM=m CONFIG_I2C_PIIX4=m @@ -2302,7 +2302,7 @@ CONFIG_INTEL_HID_EVENT=m CONFIG_INTEL_IDLE=y CONFIG_INTEL_IDMA64=m CONFIG_INTEL_IDXD=m -# CONFIG_INTEL_IDXD_SVM is not set +CONFIG_INTEL_IDXD_SVM=y # CONFIG_INTEL_INT0002_VGPIO is not set CONFIG_INTEL_IOATDMA=m # CONFIG_INTEL_IOMMU_DEBUGFS is not set |