about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2020-02-03 22:44:34 +0100
committerGitHub <noreply@github.com>2020-02-03 22:44:34 +0100
commit30a4f9e86959f992df3a970d75214173e3530778 (patch)
treebd093794b3bc8b26a3e16089e2009eb5e91fec40
parentca00a3f302710cb1e0317fd11294b773c9385f46 (diff)
parent149737a2a42941ecf2f7ddca49c4e7474cb32e5d (diff)
downloadnixlib-30a4f9e86959f992df3a970d75214173e3530778.tar
nixlib-30a4f9e86959f992df3a970d75214173e3530778.tar.gz
nixlib-30a4f9e86959f992df3a970d75214173e3530778.tar.bz2
nixlib-30a4f9e86959f992df3a970d75214173e3530778.tar.lz
nixlib-30a4f9e86959f992df3a970d75214173e3530778.tar.xz
nixlib-30a4f9e86959f992df3a970d75214173e3530778.tar.zst
nixlib-30a4f9e86959f992df3a970d75214173e3530778.zip
Merge pull request #79164 from misuzu/kernel-nvme-hwmon
linux: Enable NVME_HWMON
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 4ce6a37e689c..7ecff5207df8 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -710,6 +710,7 @@ let
 
       HWMON         = yes;
       THERMAL_HWMON = yes; # Hardware monitoring support
+      NVME_HWMON    = whenAtLeast "5.5" yes; # NVMe drives temperature reporting
       UEVENT_HELPER = no;
 
       USERFAULTFD   = yes;