Author: eelco
Date: Mon Oct 24 16:30:59 2011
New Revision: 29994
URL: https://nixos.org/websvn/nix/?rev=29994&sc=1

Log:
* Enable staging drivers in Linux 3.x.  Staging drivers are more experimental
  and lower quality than regular drivers.  However, there are a lot of drivers
  for wireless cards that we really need to have.  And it doesn't really hurt
  to have these drivers if you don't need them.
* Enable the Radeon KMS option.  This shouldn't be a problem since the X driver
  supports KMS (I think).

Modified:
   nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.0.nix
   nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.1.nix

Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.0.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.0.nix   Mon Oct 24 
16:06:31 2011        (r29993)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.0.nix   Mon Oct 24 
16:30:59 2011        (r29994)
@@ -77,8 +77,9 @@
       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 @@
       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}
     '';

Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.1.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.1.nix   Mon Oct 24 
16:06:31 2011        (r29993)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.1.nix   Mon Oct 24 
16:30:59 2011        (r29994)
@@ -77,8 +77,9 @@
       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 @@
       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}
     '';
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to