From c13587d6b32bcb9fcbf4ccfc475f3ece1caa8357 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Apr 2009 11:17:17 +0000
Subject: [PATCH] * Bump the default kernel to 2.6.28.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15268
---
 pkgs/top-level/all-packages.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 306ecf6a805..c8d51cd5cf2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7155,7 +7155,8 @@ let
     };
 
     splashutils =
-      if kernel.features ? fbSplash then splashutils_13 else
+      # Splashutils 1.3 is broken, so disable splash on older kernels.
+      if kernel.features ? fbSplash then /* splashutils_13 */ null else
       if kernel.features ? fbConDecor && system != "x86_64-linux" then splashutils_15 else
       null;
 
@@ -7214,7 +7215,7 @@ let
   kernelPackages_2_6_28 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_28);
 
   # The current default kernel / kernel modules.
-  kernelPackages = kernelPackages_2_6_25;
+  kernelPackages = kernelPackages_2_6_28;
 
   customKernel = composedArgsAndFun (lib.sumTwoArgs (import ../os-specific/linux/kernel/generic.nix) {
     inherit fetchurl stdenv perl mktemp module_init_tools;