diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-12-05 18:23:56 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-12-05 18:23:56 +0100 |
| commit | 889961e7d1825ddabd68eaa9ea87e8700cb14783 (patch) | |
| tree | b4b3a46eba33e775c691c90a4993a5d88faad302 /kernel-i686-fedora.config | |
| parent | f1eff899041d03a2a65502bc7dc965965f0c8dd9 (diff) | |
| parent | 3c594e0587fa25d240477860c4711b8ffd035d88 (diff) | |
| download | kernel-889961e7d1825ddabd68eaa9ea87e8700cb14783.tar.gz kernel-889961e7d1825ddabd68eaa9ea87e8700cb14783.tar.xz kernel-889961e7d1825ddabd68eaa9ea87e8700cb14783.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.5.0-0.rc0.git6.1.vanilla.knurd.1.fc32kernel-5.5.0-0.rc0.git6.1.vanilla.knurd.1.fc31kernel-5.5.0-0.rc0.git6.1.vanilla.knurd.1.fc30
Diffstat (limited to 'kernel-i686-fedora.config')
| -rw-r--r-- | kernel-i686-fedora.config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 7769e1244..78b7577b5 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -926,8 +926,7 @@ CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_CURVE25519=m CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DES=m -# CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set -CONFIG_CRYPTO_DEV_AMLOGIC_GXL=y +# CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set # CONFIG_CRYPTO_DEV_ATMEL_ECC is not set # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set CONFIG_CRYPTO_DEV_CCP_CRYPTO=m @@ -5948,6 +5947,7 @@ CONFIG_TPM_KEY_PARSER=m # CONFIG_TPS68470_PMIC_OPREGION is not set CONFIG_TQMX86_WDT=m CONFIG_TRACE_EVAL_MAP_FILE=y +# CONFIG_TRACE_EVENT_INJECT is not set # CONFIG_TRACEPOINT_BENCHMARK is not set # CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set CONFIG_TRACER_SNAPSHOT=y |