summaryrefslogtreecommitdiffstats
path: root/kernel-i686-fedora.config
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-01-26 20:38:01 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2021-01-26 20:38:01 +0100
commit03ca489db66dd860102f3da468d7a53d0547a8c5 (patch)
tree18a18db89b11bb442ac5ca2706dfe5e6cf07dea4 /kernel-i686-fedora.config
parent7859ab724d58cefe5f67aeec124388dca72c5287 (diff)
parent16838a0aa56767d53e0207778de72b2ed63249b3 (diff)
downloadkernel-03ca489db66dd860102f3da468d7a53d0547a8c5.tar.gz
kernel-03ca489db66dd860102f3da468d7a53d0547a8c5.tar.xz
kernel-03ca489db66dd860102f3da468d7a53d0547a8c5.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.11.0-0.rc5.20210126git13391c60da33.135.vanilla.1.fc33
Diffstat (limited to 'kernel-i686-fedora.config')
-rw-r--r--kernel-i686-fedora.config3
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index be3c50e37..00c97bbf8 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -227,7 +227,6 @@ CONFIG_AMD8111_ETH=m
# CONFIG_AMD_IOMMU_DEBUGFS is not set
CONFIG_AMD_PHY=m
CONFIG_AMD_PMC=m
-CONFIG_AMD_SFH_HID=m
# CONFIG_AMDTEE is not set
CONFIG_AMD_XGBE_DCB=y
CONFIG_AMD_XGBE=m
@@ -7027,7 +7026,6 @@ CONFIG_VFIO_MDEV=m
CONFIG_VFIO_PCI_IGD=y
CONFIG_VFIO_PCI=m
CONFIG_VFIO_PCI_VGA=y
-CONFIG_VFIO_PCI_ZDEV=y
CONFIG_VGA_ARB_MAX_GPUS=16
CONFIG_VGA_ARB=y
# CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT is not set
@@ -7487,7 +7485,6 @@ CONFIG_YELLOWFIN=m
CONFIG_YENTA=m
CONFIG_Z3FOLD=y
CONFIG_ZBUD=y
-# CONFIG_ZCRYPT_DEBUG is not set
# CONFIG_ZD1211RW_DEBUG is not set
CONFIG_ZD1211RW=m
CONFIG_ZEROPLUS_FF=y