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 3fcc30dc07314ce0fc7460dfb956d260bf602829..4761c461d23a62a4ba44e015c106bd5d5bdbd02c 100644 (file)
--- a/include/asm-x86/bugs.h
+++ b/include/asm-x86/bugs.h
@@ -1,7 +1,7 @@
-#ifndef _ASM_X86_BUGS_H
-#define _ASM_X86_BUGS_H
+#ifndef ASM_X86__BUGS_H
+#define ASM_X86__BUGS_H
 
 extern void check_bugs(void);
-extern int ppro_with_ram_bug(void);
+int ppro_with_ram_bug(void);
 
-#endif /* _ASM_X86_BUGS_H */
+#endif /* ASM_X86__BUGS_H */