From 67967a8b99a8b0d80a358f89bedf8f5fa1903ccd Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 28 Feb 2013 04:37:21 +0100
Subject: mmrnmhrm: Update kernel config and source.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 machines/mmrnmhrm-kconf.nix | 11 +++++++++--
 overrides/default.nix       |  4 ++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/machines/mmrnmhrm-kconf.nix b/machines/mmrnmhrm-kconf.nix
index b7e40ebb..cf30621f 100644
--- a/machines/mmrnmhrm-kconf.nix
+++ b/machines/mmrnmhrm-kconf.nix
@@ -108,8 +108,11 @@
   "CONFIG_NAMESPACES" = "y";
   "CONFIG_UTS_NS" = "y";
   "CONFIG_IPC_NS" = "y";
+  "CONFIG_USER_NS" = "y";
   "CONFIG_PID_NS" = "y";
   "CONFIG_NET_NS" = "y";
+  "CONFIG_UIDGID_CONVERTED" = "y";
+  "CONFIG_UIDGID_STRICT_TYPE_CHECKS" = "y";
   "CONFIG_SCHED_AUTOGROUP" = "y";
   "CONFIG_RELAY" = "y";
   "CONFIG_BLK_DEV_INITRD" = "y";
@@ -525,6 +528,7 @@
   "CONFIG_PPS" = "y";
   "CONFIG_PTP_1588_CLOCK" = "y";
   "CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB" = "y";
+  "CONFIG_GPIO_DEVRES" = "y";
   "CONFIG_POWER_SUPPLY" = "y";
   "CONFIG_POWER_RESET" = "y";
   "CONFIG_HWMON" = "y";
@@ -555,13 +559,14 @@
   "CONFIG_DRM" = "y";
   "CONFIG_DRM_KMS_HELPER" = "y";
   "CONFIG_DRM_TTM" = "y";
+  "CONFIG_DRM_I2C_CH7006" = "m";
+  "CONFIG_DRM_I2C_SIL164" = "m";
   "CONFIG_DRM_NOUVEAU" = "y";
   "CONFIG_NOUVEAU_DEBUG" = "5";
   "CONFIG_NOUVEAU_DEBUG_DEFAULT" = "3";
   "CONFIG_DRM_NOUVEAU_BACKLIGHT" = "y";
-  "CONFIG_DRM_I2C_CH7006" = "m";
-  "CONFIG_DRM_I2C_SIL164" = "m";
   "CONFIG_VIDEO_OUTPUT_CONTROL" = "y";
+  "CONFIG_HDMI" = "y";
   "CONFIG_FB" = "y";
   "CONFIG_FB_CFB_FILLRECT" = "y";
   "CONFIG_FB_CFB_COPYAREA" = "y";
@@ -968,6 +973,8 @@
   "CONFIG_CRYPTO_CRC32C" = "y";
   "CONFIG_CRYPTO_CRC32C_X86_64" = "y";
   "CONFIG_CRYPTO_CRC32C_INTEL" = "y";
+  "CONFIG_CRYPTO_CRC32" = "y";
+  "CONFIG_CRYPTO_CRC32_PCLMUL" = "y";
   "CONFIG_CRYPTO_GHASH" = "y";
   "CONFIG_CRYPTO_MD4" = "y";
   "CONFIG_CRYPTO_MD5" = "y";
diff --git a/overrides/default.nix b/overrides/default.nix
index 39a62246..8e947170 100644
--- a/overrides/default.nix
+++ b/overrides/default.nix
@@ -59,8 +59,8 @@ let
       version = "3.8.0";
       src = everything.fetchgit {
         url = /home/aszlig/linux;
-        rev = "ab7826595e9ec51a51f622c5fc91e2f59440481a";
-        sha256 = "0x7lmzxn4004jrqvdn047r7rg7izzm69ybspizr9l7vycjm4h7ls";
+        rev = "e3c4877de8b9d93bd47b6ee88eb594b1c1e10da5";
+        sha256 = "1f1wn5nqi2kldn5cqa4waaaf7jjipd5ry8fa1vqj8chvhijlxb45";
       };
     };
 
-- 
cgit 1.4.1