diff options
Diffstat (limited to 'pkgs/os-specific/linux/kernel/linux-3.1.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.1.nix | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix index 4f8d08340e6a..d37887ec14aa 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.1.nix @@ -77,8 +77,9 @@ let FB_GEODE y # Video configuration - # The intel drivers already require KMS + # Enable KMS for devices whose X.org driver supports it. DRM_I915_KMS y + DRM_RADEON_KMS y # Hybrid graphics support VGA_SWITCHEROO y @@ -192,6 +193,10 @@ let CGROUP_MEM_RES_CTLR_SWAP? y DEVPTS_MULTIPLE_INSTANCES? y + # Enable staging drivers. These are somewhat experimental, but + # they generally don't hurt. + STAGING y + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} ${extraConfig} ''; @@ -200,18 +205,17 @@ in import ./generic.nix ( rec { - version = "3.1-rc8"; + version = "3.1"; - modDirVersion = "3.1.0-rc8"; + modDirVersion = "3.1.0"; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" ''; src = fetchurl { - url = "https://github.com/torvalds/linux/tarball/v${version}"; - sha256 = "1sz6snv2wavzasrswaprkjpzpll4247v4br0x2i6sndl2nqa6jz7"; - name = "v${version}.tar.gz"; + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2"; + sha256 = "0nck9cx66crqhw17y4vc3rfqrcz5269nwn2p5dh0qjvmihvx4wr5"; }; config = configWithPlatform stdenv.platform; |