diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-10-05 16:41:11 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-10-05 16:41:11 +0200 |
| commit | def8cf129efcd41942f6684e26e737bbfca5d62e (patch) | |
| tree | b51ef92aaca6e7f48037d71d69b38fc896ebd344 /kernel-s390x-rhel.config | |
| parent | 478ad513ed09190433b1c01bb4a7f6cb64b3b149 (diff) | |
| parent | 5f7d08ee5f8b230f5dfb20783ec265ef40387520 (diff) | |
| download | kernel-def8cf129efcd41942f6684e26e737bbfca5d62e.tar.gz kernel-def8cf129efcd41942f6684e26e737bbfca5d62e.tar.xz kernel-def8cf129efcd41942f6684e26e737bbfca5d62e.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc8.28.vanilla.1.fc34kernel-5.9.0-0.rc8.28.vanilla.1.fc33kernel-5.9.0-0.rc8.28.vanilla.1.fc32kernel-5.9.0-0.rc8.28.vanilla.1.fc31
Diffstat (limited to 'kernel-s390x-rhel.config')
| -rw-r--r-- | kernel-s390x-rhel.config | 4 |
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 |