Author: egorochkin
Date: Sat Sep 18 16:22:04 2010
New Revision: 23856
URL: https://svn.nixos.org/websvn/nix/?rev=23856&sc=1
Log:
Revert "Make kernel work for me". Committed this by accident.
This reverts commit 8a2cd2c99f26e5bd5c5a324e2a1712db8991379e.
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
nixpkgs/trunk/pkgs/top-level/platforms.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.32.nix Sat Sep
18 16:20:06 2010 (r23855)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.32.nix Sat Sep
18 16:22:04 2010 (r23856)
@@ -155,7 +155,7 @@
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
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Sep 18 16:20:06
2010 (r23855)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Sep 18 16:22:04
2010 (r23856)
@@ -4506,7 +4506,7 @@
kernelPatches.sec_perm_2_6_24
kernelPatches.aufs2_2_6_32
kernelPatches.cifs_timeout
-# kernelPatches.no_xsave
+ kernelPatches.no_xsave
kernelPatches.dell_rfkill
];
};
Modified: nixpkgs/trunk/pkgs/top-level/platforms.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/platforms.nix Sat Sep 18 16:20:06 2010
(r23855)
+++ nixpkgs/trunk/pkgs/top-level/platforms.nix Sat Sep 18 16:22:04 2010
(r23856)
@@ -16,11 +16,11 @@
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
'';
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
