about summary refs log tree commit diff
path: root/machines
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2013-03-03 09:27:51 +0100
committeraszlig <aszlig@redmoonstudios.org>2013-03-03 09:27:51 +0100
commit5823f86874f6f84f727f92d13bb69ca6015c5cc6 (patch)
treee9dae1fdb16647bacd189949097f3bc7dd9d0ae8 /machines
parentc4405f54375592c080ebd8eb675432b2b5337f81 (diff)
mmrnmhrm: Update kernel source and configuration.
This updates the kernel source to the latest mainline master revision plus the
fake extra version.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'machines')
-rw-r--r--machines/mmrnmhrm-kconf.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/machines/mmrnmhrm-kconf.nix b/machines/mmrnmhrm-kconf.nix
index 8a22a94b..4cb31324 100644
--- a/machines/mmrnmhrm-kconf.nix
+++ b/machines/mmrnmhrm-kconf.nix
@@ -537,7 +537,10 @@
   "CONFIG_THERMAL" = "y";
   "CONFIG_THERMAL_HWMON" = "y";
   "CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE" = "y";
-  "CONFIG_STEP_WISE" = "y";
+  "CONFIG_THERMAL_GOV_FAIR_SHARE" = "y";
+  "CONFIG_THERMAL_GOV_STEP_WISE" = "y";
+  "CONFIG_THERMAL_GOV_USER_SPACE" = "y";
+  "CONFIG_INTEL_POWERCLAMP" = "m";
   "CONFIG_SSB_POSSIBLE" = "y";
   "CONFIG_BCMA_POSSIBLE" = "y";
   "CONFIG_MFD_CORE" = "y";
@@ -933,6 +936,7 @@
   "CONFIG_KEYS_DEBUG_PROC_KEYS" = "y";
   "CONFIG_DEFAULT_SECURITY_DAC" = "y";
   "CONFIG_DEFAULT_SECURITY" = "";
+  "CONFIG_XOR_BLOCKS" = "y";
   "CONFIG_CRYPTO" = "y";
   "CONFIG_CRYPTO_ALGAPI" = "y";
   "CONFIG_CRYPTO_ALGAPI2" = "y";
@@ -1045,6 +1049,7 @@
   "CONFIG_KVM" = "y";
   "CONFIG_KVM_INTEL" = "y";
   "CONFIG_VHOST_NET" = "m";
+  "CONFIG_RAID6_PQ" = "y";
   "CONFIG_BITREVERSE" = "y";
   "CONFIG_GENERIC_STRNCPY_FROM_USER" = "y";
   "CONFIG_GENERIC_STRNLEN_USER" = "y";