diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 4a97a466e0f..6d04340ab46 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -565,7 +565,9 @@ with stdenv.lib; # Media support. MEDIA_DIGITAL_TV_SUPPORT y MEDIA_CAMERA_SUPPORT y - MEDIA_RC_SUPPORT y + ${optionalString (versionOlder version "4.14") '' + MEDIA_RC_SUPPORT y + ''} MEDIA_USB_SUPPORT y MEDIA_PCI_SUPPORT y diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 6778e11710f..57e2eda0e90 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.13-rc7"; - modDirVersion = "4.13.0-rc7"; - extraMeta.branch = "4.13"; + version = "4.14-rc1"; + modDirVersion = "4.14.0-rc1"; + extraMeta.branch = "4.14"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1xkfxsvdhd0xcfjcr78222sa58i02z2ca9fv804jbyp7w9g628rm"; + sha256 = "0dhcsjgcy28pyyzwf2s0862p92bwb324kapli2y9n90bw0kl53gi"; }; features.iwlwifi = true;