diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-09-07 15:31:14 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-09-07 15:31:14 +0200 |
commit | 7e94b9d93d2b0133f198cfb7315fdb011cdc21bf (patch) | |
tree | 07ca66d809cd994bf470f4a0692d5e84e7be31fb /kernel-i686-debug-fedora.config | |
parent | b006d4c8a7650c95a1504f20f82569221ad8db24 (diff) | |
parent | 45d4c5a623b7a0f6aeb373f4760dd0ce4d841942 (diff) | |
download | kernel-7e94b9d93d2b0133f198cfb7315fdb011cdc21bf.tar.gz kernel-7e94b9d93d2b0133f198cfb7315fdb011cdc21bf.tar.xz kernel-7e94b9d93d2b0133f198cfb7315fdb011cdc21bf.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc4.5.vanilla.2.fc34kernel-5.9.0-0.rc4.5.vanilla.2.fc33kernel-5.9.0-0.rc4.5.vanilla.2.fc32kernel-5.9.0-0.rc4.5.vanilla.2.fc31
Diffstat (limited to 'kernel-i686-debug-fedora.config')
-rw-r--r-- | kernel-i686-debug-fedora.config | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index b5c4b458e..04fd8a3e7 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -6791,7 +6791,7 @@ CONFIG_USB_WDM=m CONFIG_USB_XHCI_DBGCAP=y CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_HISTB is not set -CONFIG_USB_XHCI_PCI_RENESAS=m +CONFIG_USB_XHCI_PCI_RENESAS=y # CONFIG_USB_XHCI_PLATFORM is not set CONFIG_USB_XUSBATM=m CONFIG_USB=y @@ -7241,6 +7241,7 @@ CONFIG_XEN_SCRUB_PAGES_DEFAULT=y CONFIG_XEN_SCSI_BACKEND=m CONFIG_XEN_SCSI_FRONTEND=m CONFIG_XEN_SYMS=y +CONFIG_XEN_UNPOPULATED_ALLOC=y CONFIG_XEN_WDT=m CONFIG_XEN=y CONFIG_XFRM_INTERFACE=m |