diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-10-03 17:55:01 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-10-03 17:55:01 +0200 |
commit | a50081b60368f2d368940c9b905256024083b426 (patch) | |
tree | cf7d3525e6ade1532d68f9514ca7b086e6831df2 /kernel-s390x-rhel.config | |
parent | 84eb39057c4d2a0a4d9df3df95f683d86f5a521d (diff) | |
parent | 247e0276be5baeec57dba5c3e678c5bac054b026 (diff) | |
download | kernel-a50081b60368f2d368940c9b905256024083b426.tar.gz kernel-a50081b60368f2d368940c9b905256024083b426.tar.xz kernel-a50081b60368f2d368940c9b905256024083b426.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.0.0-54.vanilla.1.fc38kernel-6.0.0-54.vanilla.1.fc37kernel-6.0.0-54.vanilla.1.fc36kernel-6.0.0-54.vanilla.1.fc35
Diffstat (limited to 'kernel-s390x-rhel.config')
-rw-r--r-- | kernel-s390x-rhel.config | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 2e0b0d7cd..2e0155ce9 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -257,7 +257,6 @@ CONFIG_ARM_CMN=m # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set CONFIG_ARM_SMCCC_SOC_ID=y # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set -# CONFIG_ARM_SMMU_QCOM_DEBUG is not set # CONFIG_AS3935 is not set # CONFIG_AS73211 is not set CONFIG_ASN1=y @@ -3718,7 +3717,7 @@ CONFIG_N_GSM=m # CONFIG_NIC7018_WDT is not set # CONFIG_NILFS2_FS is not set CONFIG_NITRO_ENCLAVES=m -# CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST is not set +CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST=y # CONFIG_NL80211_TESTMODE is not set CONFIG_NLMON=m CONFIG_NLS_ASCII=y |