summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorThomas Strobel <ts468@cam.ac.uk>2015-10-01 17:52:04 +0200
committerThomas Strobel <ts468@cam.ac.uk>2015-10-01 17:53:51 +0200
commitc720f06f7c84bed458eecb78c37eaf993b6f1404 (patch)
tree36a295948c032c71b4ba9b5b8eeca282fdf16aa5 /pkgs/os-specific
parent6dfb16730bb8348c9466260983fb313477611dec (diff)
downloadnixlib-c720f06f7c84bed458eecb78c37eaf993b6f1404.tar
nixlib-c720f06f7c84bed458eecb78c37eaf993b6f1404.tar.gz
nixlib-c720f06f7c84bed458eecb78c37eaf993b6f1404.tar.bz2
nixlib-c720f06f7c84bed458eecb78c37eaf993b6f1404.tar.lz
nixlib-c720f06f7c84bed458eecb78c37eaf993b6f1404.tar.xz
nixlib-c720f06f7c84bed458eecb78c37eaf993b6f1404.tar.zst
nixlib-c720f06f7c84bed458eecb78c37eaf993b6f1404.zip
linux kernel common config: re-enable NFC support
As test, Linux kernels were build successfully with NFC support for 3.18.x and
for 4.1.x.
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix2
1 files changed, 0 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index ef35757fdb24..218532a695e0 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -478,8 +478,6 @@ with stdenv.lib;
   ''}
   ZRAM m
 
-  ${optionalString (versionAtLeast version "3.17") "NFC? n"}
-
   # Enable firmware loading via udev (legacy).
   ${optionalString (versionAtLeast version "3.17") ''
     FW_LOADER_USER_HELPER_FALLBACK y