From 9f696ae43e4496e6cbe56e7b43cafa54c57b05ca Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 18 Sep 2010 16:22:04 +0000 Subject: [PATCH] Revert "Make kernel work for me". Committed this by accident. This reverts commit 8a2cd2c99f26e5bd5c5a324e2a1712db8991379e. svn path=/nixpkgs/trunk/; revision=23856 --- pkgs/os-specific/linux/kernel/linux-2.6.32.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/platforms.nix | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix index 4347b2baebe..adda4b4be8c 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix @@ -155,7 +155,7 @@ let BT_HCIUART_LL y BT_RFCOMM_TTY y # RFCOMM TTY support CPU_FREQ_DEBUG n - + CRASH_DUMP n DMAR? n # experimental DVB_DYNAMIC_MINORS y # we use udev FUSION y # Fusion MPT device support diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4025c0334b0..fa850110c56 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4506,7 +4506,7 @@ let kernelPatches.sec_perm_2_6_24 kernelPatches.aufs2_2_6_32 kernelPatches.cifs_timeout -# kernelPatches.no_xsave + kernelPatches.no_xsave kernelPatches.dell_rfkill ]; }; diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index 85bb789df1c..7bd27ebf4f9 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -16,11 +16,11 @@ rec { PARAVIRT_GUEST y KVM_CLOCK y KVM_GUEST y - #XEN y + XEN y KSM y # We need 64 GB (PAE) support for Xen guest support. - #HIGHMEM64G? y + HIGHMEM64G? y ''; };