about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAustin Seipp <aseipp@pobox.com>2014-08-29 00:51:34 -0500
committerAustin Seipp <aseipp@pobox.com>2014-08-29 00:51:34 -0500
commit4e0d2706f174bb893378a8241df7bd2055901b9e (patch)
tree67841b3eec81501239c487c3ee0057c7ea4b5cca
parente0e65cbf8e4ce940c67b5d0fb0d349758230119e (diff)
parent0bb14e4fea539bc247faffe7c9c4943eef54b118 (diff)
downloadnixlib-4e0d2706f174bb893378a8241df7bd2055901b9e.tar
nixlib-4e0d2706f174bb893378a8241df7bd2055901b9e.tar.gz
nixlib-4e0d2706f174bb893378a8241df7bd2055901b9e.tar.bz2
nixlib-4e0d2706f174bb893378a8241df7bd2055901b9e.tar.lz
nixlib-4e0d2706f174bb893378a8241df7bd2055901b9e.tar.xz
nixlib-4e0d2706f174bb893378a8241df7bd2055901b9e.tar.zst
nixlib-4e0d2706f174bb893378a8241df7bd2055901b9e.zip
Merge pull request #3846 from copumpkin/kernel317
Disable NFC on 3.17 or above
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 7a6ba94eb9fe..d5c754eebc7b 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -337,6 +337,8 @@ with stdenv.lib;
     ZSMALLOC y
   ''}
   ZRAM m
+  
+  ${optionalString (versionAtLeast version "3.17") "NFC? n"}
 
   ${kernelPlatform.kernelExtraConfig or ""}
   ${extraConfig}