From 44a7f10074bfb9aabc37a9a5112feba4ab6c884f Mon Sep 17 00:00:00 2001
From: Andy Whitcroft <apw@canonical.com>
Date: Wed, 28 Oct 2009 12:38:34 +0000
Subject: [PATCH 1/2] Revert "UBUNTU: [Config] CONFIG_X86_MCE"

This reverts commit ecae83a7adca974982267a4084a30033de9b6b22.
---
 debian.master/config/config.common.ubuntu |   11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index c6bbae9..323bc7c 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1892,9 +1892,9 @@ CONFIG_LIBIPW_DEBUG=y
 CONFIG_LINE6_USB=m
 CONFIG_LIRC_ATIUSB=m
 CONFIG_LIRC_BT829=m
+CONFIG_LIRC_ENE0100=m
 CONFIG_LIRC_CONFIG_LIRC_WPC8769L=m
 CONFIG_LIRC_DEV=m
-CONFIG_LIRC_ENE0100=m
 # CONFIG_LIRC_GPIO is not set
 CONFIG_LIRC_I2C=m
 CONFIG_LIRC_IGORPLUGUSB=m
@@ -4276,16 +4276,10 @@ CONFIG_X86_L1_CACHE_BYTES=64
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_LONGHAUL=y
 CONFIG_X86_LONGRUN=y
-CONFIG_X86_MCE=y
-CONFIG_X86_MCE_AMD=y
-CONFIG_X86_MCE_INJECT=m
-CONFIG_X86_MCE_INTEL=y
-CONFIG_X86_MCE_THRESHOLD=y
+# CONFIG_X86_MCE is not set
 CONFIG_X86_MPPARSE=y
 CONFIG_X86_MSR=m
 CONFIG_X86_NEED_RELOCS=y
-CONFIG_X86_NEW_MCE=y
-# CONFIG_X86_OLD_MCE is not set
 CONFIG_X86_P4_CLOCKMOD=m
 CONFIG_X86_PAE=y
 CONFIG_X86_PAT=y
@@ -4307,7 +4301,6 @@ CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
 CONFIG_X86_SPEEDSTEP_ICH=y
 CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
 CONFIG_X86_SPEEDSTEP_SMI=y
-CONFIG_X86_THERMAL_VECTOR=y
 CONFIG_X86_TRAMPOLINE=y
 CONFIG_X86_TSC=y
 # CONFIG_X86_VERBOSE_BOOTUP is not set
-- 
1.6.3.3