diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-12-08 16:00:11 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-12-08 16:00:11 +0100 |
| commit | 40f51fc60d7788d319a410f505da99693c3890a3 (patch) | |
| tree | 1c870816b7ea45e8219e333843d1090f5421342c /kernel-x86_64-fedora.config | |
| parent | e96bdad0f635102e43c0a18cb6bbe4bb9eb01ea5 (diff) | |
| parent | f809de26bb3d91f36fbad53af753e6a807c22e33 (diff) | |
| download | kernel-40f51fc60d7788d319a410f505da99693c3890a3.tar.gz kernel-40f51fc60d7788d319a410f505da99693c3890a3.tar.xz kernel-40f51fc60d7788d319a410f505da99693c3890a3.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.16.0-0.rc4.20211207gitcd8c917a56f2.30.vanilla.1.fc35
Diffstat (limited to 'kernel-x86_64-fedora.config')
| -rw-r--r-- | kernel-x86_64-fedora.config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 3f99636fc..0bea5d58c 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -6657,7 +6657,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -# CONFIG_TEE is not set +CONFIG_TEE=m CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m @@ -6877,7 +6877,7 @@ CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y CONFIG_TRANSPARENT_HUGEPAGE=y -CONFIG_TRUSTED_KEYS=m +CONFIG_TRUSTED_KEYS=y # CONFIG_TS4800_IRQ is not set # CONFIG_TS4800_WATCHDOG is not set # CONFIG_TSL2583 is not set |