From 3db520d88edfef6cdb3b8fccd4d590e6f8120144 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 22 Apr 2014 05:15:00 +0200
Subject: Update kernel and configs to version 3.15-rc2.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 machines/mmrnmhrm-kconf.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'machines/mmrnmhrm-kconf.nix')

diff --git a/machines/mmrnmhrm-kconf.nix b/machines/mmrnmhrm-kconf.nix
index 5a845135..265d28f3 100644
--- a/machines/mmrnmhrm-kconf.nix
+++ b/machines/mmrnmhrm-kconf.nix
@@ -20,7 +20,6 @@
   "CONFIG_GENERIC_CALIBRATE_DELAY" = "y";
   "CONFIG_ARCH_HAS_CPU_RELAX" = "y";
   "CONFIG_ARCH_HAS_CACHE_LINE_SIZE" = "y";
-  "CONFIG_ARCH_HAS_CPU_AUTOPROBE" = "y";
   "CONFIG_HAVE_SETUP_PER_CPU_AREA" = "y";
   "CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK" = "y";
   "CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK" = "y";
@@ -56,6 +55,7 @@
   "CONFIG_POSIX_MQUEUE" = "y";
   "CONFIG_POSIX_MQUEUE_SYSCTL" = "y";
   "CONFIG_FHANDLE" = "y";
+  "CONFIG_HAVE_ARCH_AUDITSYSCALL" = "y";
   "CONFIG_GENERIC_IRQ_PROBE" = "y";
   "CONFIG_GENERIC_IRQ_SHOW" = "y";
   "CONFIG_GENERIC_PENDING_IRQ" = "y";
@@ -128,6 +128,7 @@
   "CONFIG_SYSCTL_EXCEPTION_TRACE" = "y";
   "CONFIG_HAVE_PCSPKR_PLATFORM" = "y";
   "CONFIG_UID16" = "y";
+  "CONFIG_SYSFS_SYSCALL" = "y";
   "CONFIG_KALLSYMS" = "y";
   "CONFIG_PRINTK" = "y";
   "CONFIG_BUG" = "y";
@@ -147,6 +148,7 @@
   "CONFIG_VM_EVENT_COUNTERS" = "y";
   "CONFIG_SLUB_DEBUG" = "y";
   "CONFIG_SLUB" = "y";
+  "CONFIG_SYSTEM_TRUSTED_KEYRING" = "y";
   "CONFIG_HAVE_OPROFILE" = "y";
   "CONFIG_OPROFILE_NMI_TIMER" = "y";
   "CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS" = "y";
@@ -192,7 +194,6 @@
   "CONFIG_SLABINFO" = "y";
   "CONFIG_RT_MUTEXES" = "y";
   "CONFIG_BASE_SMALL" = "0";
-  "CONFIG_SYSTEM_TRUSTED_KEYRING" = "y";
   "CONFIG_MODULES" = "y";
   "CONFIG_MODULE_FORCE_LOAD" = "y";
   "CONFIG_MODULE_UNLOAD" = "y";
@@ -307,6 +308,7 @@
   "CONFIG_ZBUD" = "y";
   "CONFIG_ZSWAP" = "y";
   "CONFIG_ZSMALLOC" = "y";
+  "CONFIG_GENERIC_EARLY_IOREMAP" = "y";
   "CONFIG_X86_RESERVE_LOW" = "64";
   "CONFIG_MTRR" = "y";
   "CONFIG_MTRR_SANITIZER" = "y";
@@ -394,6 +396,7 @@
   "CONFIG_IPV6_NDISC_NODETYPE" = "y";
   "CONFIG_IPV6_TUNNEL" = "m";
   "CONFIG_IPV6_GRE" = "m";
+  "CONFIG_NET_PTP_CLASSIFY" = "y";
   "CONFIG_HAVE_NET_DSA" = "y";
   "CONFIG_NET_SCHED" = "y";
   "CONFIG_NET_SCH_CBQ" = "m";
@@ -455,7 +458,6 @@
   "CONFIG_RPS" = "y";
   "CONFIG_RFS_ACCEL" = "y";
   "CONFIG_XPS" = "y";
-  "CONFIG_CGROUP_NET_PRIO" = "m";
   "CONFIG_CGROUP_NET_CLASSID" = "y";
   "CONFIG_NET_RX_BUSY_POLL" = "y";
   "CONFIG_BQL" = "y";
@@ -467,6 +469,7 @@
   "CONFIG_DEVTMPFS_MOUNT" = "y";
   "CONFIG_FW_LOADER" = "y";
   "CONFIG_EXTRA_FIRMWARE" = "";
+  "CONFIG_GENERIC_CPU_AUTOPROBE" = "y";
   "CONFIG_DMA_SHARED_BUFFER" = "y";
   "CONFIG_CONNECTOR" = "y";
   "CONFIG_PROC_EVENTS" = "y";
@@ -476,6 +479,7 @@
   "CONFIG_BLK_DEV" = "y";
   "CONFIG_BLK_DEV_NULL_BLK" = "m";
   "CONFIG_ZRAM" = "y";
+  "CONFIG_ZRAM_LZ4_COMPRESS" = "y";
   "CONFIG_BLK_DEV_LOOP" = "y";
   "CONFIG_BLK_DEV_LOOP_MIN_COUNT" = "0";
   "CONFIG_BLK_DEV_CRYPTOLOOP" = "m";
@@ -595,8 +599,6 @@
   "CONFIG_NOUVEAU_DEBUG_DEFAULT" = "3";
   "CONFIG_DRM_NOUVEAU_BACKLIGHT" = "y";
   "CONFIG_DRM_BOCHS" = "m";
-  "CONFIG_VIDEO_OUTPUT_CONTROL" = "y";
-  "CONFIG_HDMI" = "y";
   "CONFIG_FB" = "y";
   "CONFIG_FB_CFB_FILLRECT" = "y";
   "CONFIG_FB_CFB_COPYAREA" = "y";
@@ -609,6 +611,7 @@
   "CONFIG_FB_TILEBLITTING" = "y";
   "CONFIG_BACKLIGHT_LCD_SUPPORT" = "y";
   "CONFIG_BACKLIGHT_CLASS_DEVICE" = "y";
+  "CONFIG_HDMI" = "y";
   "CONFIG_VGA_CONSOLE" = "y";
   "CONFIG_VGACON_SOFT_SCROLLBACK" = "y";
   "CONFIG_VGACON_SOFT_SCROLLBACK_SIZE" = "1024";
@@ -640,6 +643,7 @@
   "CONFIG_SND_DMA_SGBUF" = "y";
   "CONFIG_SND_RAWMIDI_SEQ" = "y";
   "CONFIG_SND_PCI" = "y";
+  "CONFIG_SND_HDA" = "y";
   "CONFIG_SND_HDA_INTEL" = "y";
   "CONFIG_SND_HDA_PREALLOC_SIZE" = "64";
   "CONFIG_SND_HDA_INPUT_BEEP" = "y";
@@ -697,6 +701,7 @@
   "CONFIG_USB_STORAGE_KARMA" = "m";
   "CONFIG_USB_STORAGE_CYPRESS_ATACB" = "m";
   "CONFIG_USB_STORAGE_ENE_UB6250" = "m";
+  "CONFIG_USB_UAS" = "m";
   "CONFIG_USB_MDC800" = "m";
   "CONFIG_USB_MICROTEK" = "m";
   "CONFIG_USB_SERIAL" = "m";
@@ -849,6 +854,7 @@
   "CONFIG_PROC_FS" = "y";
   "CONFIG_PROC_SYSCTL" = "y";
   "CONFIG_PROC_PAGE_MONITOR" = "y";
+  "CONFIG_KERNFS" = "y";
   "CONFIG_SYSFS" = "y";
   "CONFIG_TMPFS" = "y";
   "CONFIG_TMPFS_POSIX_ACL" = "y";
@@ -1152,7 +1158,7 @@
   "CONFIG_TEXTSEARCH_FSM" = "m";
   "CONFIG_ASSOCIATIVE_ARRAY" = "y";
   "CONFIG_HAS_IOMEM" = "y";
-  "CONFIG_HAS_IOPORT" = "y";
+  "CONFIG_HAS_IOPORT_MAP" = "y";
   "CONFIG_HAS_DMA" = "y";
   "CONFIG_CHECK_SIGNATURE" = "y";
   "CONFIG_CPU_RMAP" = "y";
-- 
cgit 1.4.1