summaryrefslogtreecommitdiffstats
path: root/kernel-s390x-rhel.config
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2020-10-02 12:57:41 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2020-10-02 12:57:41 -0500
commit98bf14a6aa39a24133d2087fda13ce5fb5615196 (patch)
tree010bef0fbf1f68d6beaef5d4c34a1860927e21c5 /kernel-s390x-rhel.config
parent8bf7e7fde6b9176ccaac91a0c95464f326d8a008 (diff)
downloadkernel-98bf14a6aa39a24133d2087fda13ce5fb5615196.tar.gz
kernel-98bf14a6aa39a24133d2087fda13ce5fb5615196.tar.xz
kernel-98bf14a6aa39a24133d2087fda13ce5fb5615196.zip
kernel-5.9.0-0.rc7.20201002git60e720931556.23
* Fri Oct 02 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.20201002git60e720931556.23] - Merge ark-patches Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'kernel-s390x-rhel.config')
-rw-r--r--kernel-s390x-rhel.config4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index a27af74b6..fdc704c64 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -1343,7 +1343,7 @@ CONFIG_ENABLE_MUST_CHECK=y
# CONFIG_ENA_ETHERNET is not set
CONFIG_ENCLOSURE_SERVICES=m
CONFIG_ENCRYPTED_KEYS=m
-# CONFIG_ENERGY_MODEL is not set
+CONFIG_ENERGY_MODEL=y
CONFIG_ENIC=m
CONFIG_EPIC100=m
CONFIG_EPOLL=y
@@ -5256,7 +5256,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
CONFIG_THERMAL_HWMON=y
# CONFIG_THERMAL is not set
# CONFIG_THERMAL_MMIO is not set
-# CONFIG_THERMAL_NETLINK is not set
+CONFIG_THERMAL_NETLINK=y
CONFIG_THERMAL_OF=y
# CONFIG_THERMAL_STATISTICS is not set
# CONFIG_THERMAL_WRITABLE_TRIPS is not set