Merge branch 'linus' into x86/pat2

[linux-2.6-omap-h63xx.git] / include / asm-x86 / bugs.h

diff --git a/include/asm-x86/bugs.h b/include/asm-x86/bugs.h
index ddf42d36dd506a4d906ca5356c8ac996d4a189f8..4761c461d23a62a4ba44e015c106bd5d5bdbd02c 100644 (file)
--- a/include/asm-x86/bugs.h
+++ b/include/asm-x86/bugs.h
@@ -1,5 +1,7 @@
-#ifdef CONFIG_X86_32
-# include "bugs_32.h"
-#else
-# include "bugs_64.h"
-#endif
+#ifndef ASM_X86__BUGS_H
+#define ASM_X86__BUGS_H
+
+extern void check_bugs(void);
+int ppro_with_ram_bug(void);
+
+#endif /* ASM_X86__BUGS_H */