diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-10-06 18:18:56 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-10-06 18:18:56 +0200 |
commit | a339309f875b7240e2006d47992e0b50b643d86c (patch) | |
tree | 3b04252012d12cb3a35c29729ee609668fef1b70 /kernel-i686-fedora.config | |
parent | 3d790d94ced7efa449659532cd178f7c37080e68 (diff) | |
parent | 6694d05e5fc1a4a41107a172a53f7d9b6373cadf (diff) | |
download | kernel-a339309f875b7240e2006d47992e0b50b643d86c.tar.gz kernel-a339309f875b7240e2006d47992e0b50b643d86c.tar.xz kernel-a339309f875b7240e2006d47992e0b50b643d86c.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.15.0-0.rc4.20211006git60a9483534ed.34.vanilla.1.fc36kernel-5.15.0-0.rc4.20211006git60a9483534ed.34.vanilla.1.fc35kernel-5.15.0-0.rc4.20211006git60a9483534ed.34.vanilla.1.fc34kernel-5.15.0-0.rc4.20211006git60a9483534ed.34.vanilla.1.fc33
Diffstat (limited to 'kernel-i686-fedora.config')
-rw-r--r-- | kernel-i686-fedora.config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 3192b61c3..7803be46b 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -2313,9 +2313,9 @@ CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set CONFIG_HYPERV_BALLOON=m CONFIG_HYPERV_IOMMU=y -# CONFIG_HYPERV is not set CONFIG_HYPERVISOR_GUEST=y CONFIG_HYPERV_KEYBOARD=m +CONFIG_HYPERV=m CONFIG_HYPERV_NET=m CONFIG_HYPERV_STORAGE=m # CONFIG_HYPERV_TESTING is not set |