From e8c849f8e342f677dbc1e748b515909d3a850baa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 2 Sep 2011 13:41:38 +0000
Subject: [PATCH] * Re-enable the fbcondecor patch for Linux 2.6.35, seems to
 work fine.

svn path=/nixpkgs/trunk/; revision=28974
---
 pkgs/os-specific/linux/kernel/linux-2.6.35.nix | 5 ++---
 pkgs/top-level/all-packages.nix                | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.35.nix b/pkgs/os-specific/linux/kernel/linux-2.6.35.nix
index d94c5f382a5..b08c4b9bb23 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.35.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.35.nix
@@ -1,8 +1,7 @@
-args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? ""
-, ... }:
+{ stdenv, fetchurl, extraConfig ? "", ... } @ args:
 
 let
-  configWithPlatform = kernelPlatform :
+  configWithPlatform = kernelPlatform:
     ''
       # Don't include any debug features.
       DEBUG_KERNEL n
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e180a1d86b2..8723ba72ff8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5392,7 +5392,7 @@ let
   linux_2_6_35 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.35.nix) {
     inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
     kernelPatches =
-      [ #kernelPatches.fbcondecor_2_6_35
+      [ kernelPatches.fbcondecor_2_6_35
         kernelPatches.sec_perm_2_6_24
         kernelPatches.aufs2_2_6_35
         kernelPatches.cifs_timeout_2_6_35
@@ -5659,7 +5659,7 @@ let
   linuxPackages_nanonote_jz_2_6_36 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_36 pkgs.linuxPackages_nanonote_jz_2_6_36);
 
   # The current default kernel / kernel modules.
-  linux = linux_2_6_32;
+  linux = linuxPackages.kernel;
   linuxPackages = linuxPackages_2_6_32;
 
   keyutils = callPackage ../os-specific/linux/keyutils { };