diff options
| author | lethalman <lucabru@src.gnome.org> | 2014-11-08 12:41:13 +0100 |
|---|---|---|
| committer | lethalman <lucabru@src.gnome.org> | 2014-11-08 12:41:13 +0100 |
| commit | 27b79a04696f78e3c853b6c0fb417184f6f769d6 (patch) | |
| tree | c72601803c027c21e8a03e520c0edbcc6f54b814 /pkgs/os-specific | |
| parent | cf4398cfdecf417a8e8667d90502b4d805cde866 (diff) | |
| parent | fc533f0e84728bb2413bd14e15ce91e2fe58aa94 (diff) | |
| download | nixlib-27b79a04696f78e3c853b6c0fb417184f6f769d6.tar nixlib-27b79a04696f78e3c853b6c0fb417184f6f769d6.tar.gz nixlib-27b79a04696f78e3c853b6c0fb417184f6f769d6.tar.bz2 nixlib-27b79a04696f78e3c853b6c0fb417184f6f769d6.tar.lz nixlib-27b79a04696f78e3c853b6c0fb417184f6f769d6.tar.xz nixlib-27b79a04696f78e3c853b6c0fb417184f6f769d6.tar.zst nixlib-27b79a04696f78e3c853b6c0fb417184f6f769d6.zip | |
Merge pull request #4780 from ambrop72/kernel-ppp-filter
kernel: Enable PPP_FILTER by default.
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 1 |
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 3ea4b1449376..c882ae3d029d 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -246,6 +246,7 @@ with stdenv.lib; MTRR_SANITIZER y NET_FC y # Fibre Channel driver support PPP_MULTILINK y # PPP multilink support + PPP_FILTER y REGULATOR y # Voltage and Current Regulator Support ${optionalString (versionAtLeast version "3.6") '' RC_DEVICES? y # Enable IR devices |