From f405ee266bf05bad91e522b74802a595c1c88c86 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 24 Oct 2011 16:30:59 +0000
Subject: [PATCH] * 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).

svn path=/nixpkgs/trunk/; revision=29994
---
 pkgs/os-specific/linux/kernel/linux-3.0.nix | 7 ++++++-
 pkgs/os-specific/linux/kernel/linux-3.1.nix | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix
index d2680db30f1..f3b30b329d4 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.0.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}
     '';
diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix
index 2b74c3a0ba9..d37887ec14a 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}
     '';