From 68be6fd33c12759509faca1773f329b74478f340 Mon Sep 17 00:00:00 2001
From: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Date: Fri, 30 Jan 2009 22:47:27 +0530
Subject: [PATCH] --- yaml --- r: 130691 b: refs/heads/master c:
 999b697b9d8b15756e65da72c816ef4363a945a5 h: refs/heads/master i:   130689:
 3b0f4c59e70a8f49522719106950ef72d27fcab0   130687:
 b1ab60a419ef903cb782bb8109798127f7e7d808 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/include/asm/mce.h | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 3df695b0a989..f0f183413316 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cef3767852a9b1a7ff4a8dfe0969e2d32eb728df
+refs/heads/master: 999b697b9d8b15756e65da72c816ef4363a945a5
diff --git a/trunk/arch/x86/include/asm/mce.h b/trunk/arch/x86/include/asm/mce.h
index 1d6e17c2f23a..32c6e17b960b 100644
--- a/trunk/arch/x86/include/asm/mce.h
+++ b/trunk/arch/x86/include/asm/mce.h
@@ -3,8 +3,8 @@
 
 #ifdef __x86_64__
 
+#include <linux/types.h>
 #include <asm/ioctls.h>
-#include <asm/types.h>
 
 /*
  * Machine Check support for x86
@@ -115,8 +115,6 @@ extern int mce_notify_user(void);
 
 #endif /* !CONFIG_X86_32 */
 
-
-
 #ifdef CONFIG_X86_MCE
 extern void mcheck_init(struct cpuinfo_x86 *c);
 #else
@@ -126,5 +124,4 @@ extern void stop_mce(void);
 extern void restart_mce(void);
 
 #endif /* __KERNEL__ */
-
 #endif /* _ASM_X86_MCE_H */