diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-20 13:18:33 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-20 13:25:00 +0200 |
| commit | 38ed4d4d0f9b7e5e154c59623387344f80bc6754 (patch) | |
| tree | ab2bf4b96abb4f190865e0577742ef126ca12e80 /pkgs/os-specific/linux | |
| parent | a3b873924b22f75eda45afd4ae63a44a6a7541a3 (diff) | |
| download | nixlib-38ed4d4d0f9b7e5e154c59623387344f80bc6754.tar nixlib-38ed4d4d0f9b7e5e154c59623387344f80bc6754.tar.gz nixlib-38ed4d4d0f9b7e5e154c59623387344f80bc6754.tar.bz2 nixlib-38ed4d4d0f9b7e5e154c59623387344f80bc6754.tar.lz nixlib-38ed4d4d0f9b7e5e154c59623387344f80bc6754.tar.xz nixlib-38ed4d4d0f9b7e5e154c59623387344f80bc6754.tar.zst nixlib-38ed4d4d0f9b7e5e154c59623387344f80bc6754.zip | |
linux: Enable FW_LOADER_USER_HELPER_FALLBACK
We don't really need this anymore, except that our docs say that you can put firmware in /root/test-firmware, which doesn't work via /sys/module/firmware_class/parameters/path.
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index d5c754eebc7b..f600f49a1320 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -332,14 +332,20 @@ with stdenv.lib; TRANSPARENT_HUGEPAGE_ALWAYS? n TRANSPARENT_HUGEPAGE_MADVISE? y - # zram support (e.g for in-memory compressed swap) + # zram support (e.g for in-memory compressed swap). ${optionalString (versionAtLeast version "3.4") '' ZSMALLOC y ''} ZRAM m - + ${optionalString (versionAtLeast version "3.17") "NFC? n"} + # Enable firmware loading via udev. Only needed for non-declarative + # firmware in /root/test-firmware. + ${optionalString (versionAtLeast version "3.17") '' + FW_LOADER_USER_HELPER_FALLBACK y + ''} + ${kernelPlatform.kernelExtraConfig or ""} ${extraConfig} '' |