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-s390x-debug-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-s390x-debug-fedora.config')
| -rw-r--r-- | kernel-s390x-debug-fedora.config | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 4bfde3c91..907753e6f 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -200,7 +200,6 @@ CONFIG_AMD8111_ETH=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m -CONFIG_AMD_SFH_HID=m # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set CONFIG_AMIGA_PARTITION=y @@ -6929,7 +6928,7 @@ CONFIG_YELLOWFIN=m CONFIG_YENTA=m CONFIG_Z3FOLD=y CONFIG_ZBUD=y -# CONFIG_ZCRYPT_DEBUG is not set +CONFIG_ZCRYPT_DEBUG=y CONFIG_ZCRYPT=m CONFIG_ZCRYPT_MULTIDEVNODES=y # CONFIG_ZD1211RW_DEBUG is not set |