From 549b52fc840f80d7bc207410d70ab31ad0cfa0bd Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 22 Feb 2013 16:52:46 +0100
Subject: kconf: Update mmrnmhrm's kernel config to 3.9.

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

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

diff --git a/machines/mmrnmhrm-kconf.nix b/machines/mmrnmhrm-kconf.nix
index 629e53d1..0afc8c35 100644
--- a/machines/mmrnmhrm-kconf.nix
+++ b/machines/mmrnmhrm-kconf.nix
@@ -36,7 +36,6 @@
   "CONFIG_ARCH_HWEIGHT_CFLAGS" = "-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11";
   "CONFIG_ARCH_SUPPORTS_UPROBES" = "y";
   "CONFIG_DEFCONFIG_LIST" = "/lib/modules/$UNAME_RELEASE/.config";
-  "CONFIG_HAVE_IRQ_WORK" = "y";
   "CONFIG_IRQ_WORK" = "y";
   "CONFIG_BUILDTIME_EXTABLE_SORT" = "y";
   "CONFIG_EXPERIMENTAL" = "y";
@@ -66,6 +65,7 @@
   "CONFIG_SPARSE_IRQ" = "y";
   "CONFIG_CLOCKSOURCE_WATCHDOG" = "y";
   "CONFIG_ARCH_CLOCKSOURCE_DATA" = "y";
+  "CONFIG_ALWAYS_USE_PERSISTENT_CLOCK" = "y";
   "CONFIG_GENERIC_TIME_VSYSCALL" = "y";
   "CONFIG_GENERIC_CLOCKEVENTS" = "y";
   "CONFIG_GENERIC_CLOCKEVENTS_BUILD" = "y";
@@ -84,6 +84,7 @@
   "CONFIG_TASK_IO_ACCOUNTING" = "y";
   "CONFIG_TREE_PREEMPT_RCU" = "y";
   "CONFIG_PREEMPT_RCU" = "y";
+  "CONFIG_RCU_STALL_COMMON" = "y";
   "CONFIG_RCU_FANOUT" = "64";
   "CONFIG_RCU_FANOUT_LEAF" = "16";
   "CONFIG_RCU_BOOST" = "y";
@@ -147,11 +148,13 @@
   "CONFIG_HAVE_OPROFILE" = "y";
   "CONFIG_OPROFILE_NMI_TIMER" = "y";
   "CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS" = "y";
+  "CONFIG_ARCH_USE_BUILTIN_BSWAP" = "y";
   "CONFIG_USER_RETURN_NOTIFIER" = "y";
   "CONFIG_HAVE_IOREMAP_PROT" = "y";
   "CONFIG_HAVE_KPROBES" = "y";
   "CONFIG_HAVE_KRETPROBES" = "y";
   "CONFIG_HAVE_OPTPROBES" = "y";
+  "CONFIG_HAVE_KPROBES_ON_FTRACE" = "y";
   "CONFIG_HAVE_ARCH_TRACEHOOK" = "y";
   "CONFIG_HAVE_DMA_ATTRS" = "y";
   "CONFIG_USE_GENERIC_SMP_HELPERS" = "y";
@@ -429,6 +432,7 @@
   "CONFIG_NET_ACT_CSUM" = "m";
   "CONFIG_NET_SCH_FIFO" = "y";
   "CONFIG_DNS_RESOLVER" = "y";
+  "CONFIG_VSOCKETS" = "y";
   "CONFIG_RPS" = "y";
   "CONFIG_RFS_ACCEL" = "y";
   "CONFIG_XPS" = "y";
@@ -491,6 +495,7 @@
   "CONFIG_SERIO" = "y";
   "CONFIG_SERIO_I8042" = "y";
   "CONFIG_SERIO_LIBPS2" = "y";
+  "CONFIG_TTY" = "y";
   "CONFIG_VT" = "y";
   "CONFIG_CONSOLE_TRANSLATIONS" = "y";
   "CONFIG_VT_CONSOLE" = "y";
@@ -511,6 +516,8 @@
   "CONFIG_I2C_HELPER_AUTO" = "y";
   "CONFIG_I2C_ALGOBIT" = "y";
   "CONFIG_I2C_I801" = "y";
+  "CONFIG_PPS" = "y";
+  "CONFIG_PTP_1588_CLOCK" = "y";
   "CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB" = "y";
   "CONFIG_POWER_SUPPLY" = "y";
   "CONFIG_POWER_RESET" = "y";
@@ -700,6 +707,7 @@
   "CONFIG_USB_SERIAL_OMNINET" = "m";
   "CONFIG_USB_SERIAL_OPTICON" = "m";
   "CONFIG_USB_SERIAL_VIVOPAY_SERIAL" = "m";
+  "CONFIG_USB_SERIAL_XSENS_MT" = "m";
   "CONFIG_USB_SERIAL_ZIO" = "m";
   "CONFIG_USB_SERIAL_ZTE" = "m";
   "CONFIG_USB_SERIAL_SSU100" = "m";
@@ -717,6 +725,8 @@
   "CONFIG_USB_EG20T" = "m";
   "CONFIG_USB_DUMMY_HCD" = "m";
   "CONFIG_USB_LIBCOMPOSITE" = "m";
+  "CONFIG_USB_F_ACM" = "m";
+  "CONFIG_USB_U_SERIAL" = "m";
   "CONFIG_USB_AUDIO" = "m";
   "CONFIG_USB_ETH" = "m";
   "CONFIG_USB_ETH_RNDIS" = "y";
@@ -734,8 +744,6 @@
   "CONFIG_USB_G_HID" = "m";
   "CONFIG_RTC_LIB" = "y";
   "CONFIG_RTC_CLASS" = "y";
-  "CONFIG_RTC_HCTOSYS" = "y";
-  "CONFIG_RTC_HCTOSYS_DEVICE" = "rtc0";
   "CONFIG_RTC_INTF_SYSFS" = "y";
   "CONFIG_RTC_INTF_PROC" = "y";
   "CONFIG_RTC_INTF_DEV" = "y";
@@ -751,7 +759,6 @@
   "CONFIG_I8253_LOCK" = "y";
   "CONFIG_CLKBLD_I8253" = "y";
   "CONFIG_VIRT_DRIVERS" = "y";
-  "CONFIG_EXTCON" = "m";
   "CONFIG_FIRMWARE_MEMMAP" = "y";
   "CONFIG_DMIID" = "y";
   "CONFIG_DMI_SYSFS" = "m";
@@ -889,6 +896,7 @@
   "CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST" = "y";
   "CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST" = "y";
   "CONFIG_HAVE_DYNAMIC_FTRACE" = "y";
+  "CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS" = "y";
   "CONFIG_HAVE_FTRACE_MCOUNT_RECORD" = "y";
   "CONFIG_HAVE_SYSCALL_TRACEPOINTS" = "y";
   "CONFIG_HAVE_FENTRY" = "y";
-- 
cgit 1.4.1