diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-01-26 20:38:01 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-01-26 20:38:01 +0100 |
| commit | 03ca489db66dd860102f3da468d7a53d0547a8c5 (patch) | |
| tree | 18a18db89b11bb442ac5ca2706dfe5e6cf07dea4 /kernel-x86_64-fedora.config | |
| parent | 7859ab724d58cefe5f67aeec124388dca72c5287 (diff) | |
| parent | 16838a0aa56767d53e0207778de72b2ed63249b3 (diff) | |
| download | kernel-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-x86_64-fedora.config')
| -rw-r--r-- | kernel-x86_64-fedora.config | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 3a3a693ad..4c6e05652 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -7083,7 +7083,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 @@ -7539,7 +7538,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 |