summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2016-08-29 20:21:07 +0200
committeraszlig <aszlig@redmoonstudios.org>2016-08-29 20:52:19 +0200
commit42e1ec215ea000df75db2e87273a3e8fc6167be0 (patch)
tree9bfb6a288ed915770e61aa895337685892d441f4 /pkgs
parent0bce188ec184cb1b731d8adf2ee1faa777583056 (diff)
downloadnixlib-42e1ec215ea000df75db2e87273a3e8fc6167be0.tar
nixlib-42e1ec215ea000df75db2e87273a3e8fc6167be0.tar.gz
nixlib-42e1ec215ea000df75db2e87273a3e8fc6167be0.tar.bz2
nixlib-42e1ec215ea000df75db2e87273a3e8fc6167be0.tar.lz
nixlib-42e1ec215ea000df75db2e87273a3e8fc6167be0.tar.xz
nixlib-42e1ec215ea000df75db2e87273a3e8fc6167be0.tar.zst
nixlib-42e1ec215ea000df75db2e87273a3e8fc6167be0.zip
linux/kernel: Remove MLX4_EN_VXLAN for 4.8
This option is no longer needed and has been removed in upstream commit
torvalds/linux@a831274a1346913c145797ddee6f39e30e061318.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 9fa81ea66aaa..54e6b7822f9a 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -346,7 +346,7 @@ with stdenv.lib;
   LOGO n # not needed
   MEDIA_ATTACH y
   MEGARAID_NEWGEN y
-  ${optionalString (versionAtLeast version "3.15") ''
+  ${optionalString (versionAtLeast version "3.15" && versionOlder version "4.8") ''
     MLX4_EN_VXLAN y
   ''}
   MODVERSIONS y