From 4b971ffc8d0ef0d64b65939a6f15623694f85266 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Mon, 25 Nov 2013 09:33:23 +0100
Subject: Update linux-custom to 3.12.1

---
 linux-custom/config.x86_64 | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'linux-custom/config.x86_64')

diff --git a/linux-custom/config.x86_64 b/linux-custom/config.x86_64
index e3fc024..76461e1 100644
--- a/linux-custom/config.x86_64
+++ b/linux-custom/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.12.0-1 Kernel Configuration
+# Linux/x86 3.12.1-1 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -345,7 +345,7 @@ CONFIG_FREEZER=y
 #
 CONFIG_ZONE_DMA=y
 CONFIG_SMP=y
-CONFIG_X86_X2APIC=y
+# CONFIG_X86_X2APIC is not set
 CONFIG_X86_MPPARSE=y
 # CONFIG_X86_EXTENDED_PLATFORM is not set
 # CONFIG_X86_INTEL_LPSS is not set
@@ -393,14 +393,14 @@ CONFIG_X86_IO_APIC=y
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
 CONFIG_X86_MCE=y
 CONFIG_X86_MCE_INTEL=y
-CONFIG_X86_MCE_AMD=y
+# CONFIG_X86_MCE_AMD is not set
 CONFIG_X86_MCE_THRESHOLD=y
 # CONFIG_X86_MCE_INJECT is not set
 CONFIG_X86_THERMAL_VECTOR=y
-CONFIG_I8K=m
+# CONFIG_I8K is not set
 CONFIG_MICROCODE=m
 CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y
+# CONFIG_MICROCODE_AMD is not set
 CONFIG_MICROCODE_OLD_INTERFACE=y
 CONFIG_MICROCODE_INTEL_LIB=y
 # CONFIG_MICROCODE_INTEL_EARLY is not set
@@ -4709,11 +4709,7 @@ CONFIG_A11Y_BRAILLE_CONSOLE=y
 CONFIG_EDAC=y
 CONFIG_EDAC_LEGACY_SYSFS=y
 # CONFIG_EDAC_DEBUG is not set
-CONFIG_EDAC_DECODE_MCE=m
-CONFIG_EDAC_MCE_INJ=m
 CONFIG_EDAC_MM_EDAC=m
-CONFIG_EDAC_AMD64=m
-# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
 CONFIG_EDAC_E752X=m
 CONFIG_EDAC_I82975X=m
 CONFIG_EDAC_I3000=m
-- 
cgit v1.2.3-54-g00ecf