diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-11-16 18:22:36 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-11-16 18:22:36 +0100 |
commit | 3ba3a8e92245a780e91e3137c909258b18983c4a (patch) | |
tree | 6cb4a43cf34f74a494fb17dbafc8c04f7977fc9b /kernel-s390x-fedora.config | |
parent | bc75c7de8d51677a5be44875a4e92f44cdca01b0 (diff) | |
parent | 1c3978ac3470147988e7c705fab210d159baf0ad (diff) | |
download | kernel-3ba3a8e92245a780e91e3137c909258b18983c4a.tar.gz kernel-3ba3a8e92245a780e91e3137c909258b18983c4a.tar.xz kernel-3ba3a8e92245a780e91e3137c909258b18983c4a.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.10.0-0.rc4.78.vanilla.1.fc34kernel-5.10.0-0.rc4.78.vanilla.1.fc33kernel-5.10.0-0.rc4.78.vanilla.1.fc32kernel-5.10.0-0.rc4.78.vanilla.1.fc31
Diffstat (limited to 'kernel-s390x-fedora.config')
-rw-r--r-- | kernel-s390x-fedora.config | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 614a7ed62..ec25e6307 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -254,7 +254,13 @@ CONFIG_ATH10K_SDIO=m # CONFIG_ATH10K_SPECTRAL is not set # CONFIG_ATH10K_TRACING is not set CONFIG_ATH10K_USB=m -# CONFIG_ATH11K is not set +CONFIG_ATH11K_AHB=m +CONFIG_ATH11K_DEBUGFS=y +# CONFIG_ATH11K_DEBUG is not set +CONFIG_ATH11K=m +CONFIG_ATH11K_PCI=m +# CONFIG_ATH11K_SPECTRAL is not set +# CONFIG_ATH11K_TRACING is not set CONFIG_ATH5K_DEBUG=y CONFIG_ATH5K=m # CONFIG_ATH5K_TRACER is not set @@ -4354,8 +4360,10 @@ CONFIG_QLCNIC_SRIOV=y CONFIG_QLGE=m # CONFIG_QNX4FS_FS is not set # CONFIG_QNX6FS_FS is not set -# CONFIG_QRTR is not set +CONFIG_QRTR=m CONFIG_QRTR_MHI=m +CONFIG_QRTR_SMD=m +CONFIG_QRTR_TUN=m CONFIG_QSEMI_PHY=m CONFIG_QTNFMAC_PCIE=m # CONFIG_QUICC_ENGINE is not set |