diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index ef061459191..4f08e5a6fd8 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -6,7 +6,9 @@ with stdenv.lib; # Power management and debugging. DEBUG_KERNEL y PM_ADVANCED_DEBUG y - PM_RUNTIME y + ${optionalString (versionOlder version "3.19") '' + PM_RUNTIME y + ''} ${optionalString (versionAtLeast version "3.10") '' X86_INTEL_PSTATE y ''} diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 69cefcda698..ce94288529e 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.18-rc7"; - modDirVersion = "3.18.0-rc7"; - extraMeta.branch = "3.18"; + version = "3.19-rc5"; + modDirVersion = "3.19.0-rc5"; + extraMeta.branch = "3.19"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/testing/linux-${version}.tar.xz"; - sha256 = "1zq7jd33jq4ibvjdsj8cm4zlgjag7j8r7w7ajmzivr7npdb9fvvk"; + sha256 = "1n1bzdczqi9lqb6sahm1g9f59v1h6vp6r4skyi40dk3v2xacb0nw"; }; features.iwlwifi = true;