---

yaml --- r: 130691 b: refs/heads/master c: 999b697 h: refs/heads/master i: 130689: 3b0f4c5 130687: b1ab60a v: v3
git-mirror · Jan 30, 2009 · 68be6fd · 68be6fd
1 parent b4ccbac
commit 68be6fd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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 */