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-aarch64-debug-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-aarch64-debug-fedora.config')
-rw-r--r-- | kernel-aarch64-debug-fedora.config | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 655b9b0f3..300d92da2 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -334,7 +334,6 @@ CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y CONFIG_ARM_ARCH_TIMER=y CONFIG_ARM_ARMADA_37XX_CPUFREQ=m CONFIG_ARM_ARMADA_8K_CPUFREQ=m -CONFIG_ARM_BIG_LITTLE_CPUFREQ=m # CONFIG_ARM_BIG_LITTLE_CPUIDLE is not set CONFIG_ARM_CCI400_PMU=y CONFIG_ARM_CCI5xx_PMU=y @@ -1535,6 +1534,7 @@ CONFIG_DRM_MSM=m # CONFIG_DRM_MXSFB is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y CONFIG_DRM_NOUVEAU=m +# CONFIG_DRM_NOUVEAU_SVM is not set CONFIG_DRM_NXP_PTN3460=m CONFIG_DRM_PANEL_ARM_VERSATILE=m CONFIG_DRM_PANEL_BRIDGE=y @@ -6623,6 +6623,7 @@ CONFIG_TPM_KEY_PARSER=m # CONFIG_TPS6507X is not set # CONFIG_TPS68470_PMIC_OPREGION is not set CONFIG_TRACE_EVAL_MAP_FILE=y +CONFIG_TRACE_EVENT_INJECT=y # CONFIG_TRACEPOINT_BENCHMARK is not set # CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set CONFIG_TRACER_SNAPSHOT=y |