Pull percpu-dtc into release branch

[pandora-kernel.git] / arch / i386 / kernel / cpu / mcheck / mce.c

diff --git a/arch/i386/kernel/cpu/mcheck/mce.c b/arch/i386/kernel/cpu/mcheck/mce.c
index 6170af3..4f10c62 100644 (file)
--- a/arch/i386/kernel/cpu/mcheck/mce.c
+++ b/arch/i386/kernel/cpu/mcheck/mce.c
@@ -6,13 +6,13 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/smp.h>
 #include <linux/thread_info.h>
 
 #include <asm/processor.h> 
 #include <asm/system.h>
+#include <asm/mce.h>
 
 #include "mce.h"
 
@@ -64,13 +64,13 @@ void mcheck_init(struct cpuinfo_x86 *c)
 static int __init mcheck_disable(char *str)
 {
        mce_disabled = 1;
-       return 0;
+       return 1;
 }
 
 static int __init mcheck_enable(char *str)
 {
        mce_disabled = -1;
-       return 0;
+       return 1;
 }
 
 __setup("nomce", mcheck_disable);