Merge branches 'x86/prototypes', 'x86/x2apic' and 'x86/debug' into x86/core

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

diff --git a/include/asm-x86/traps.h b/include/asm-x86/traps.h
index b60fab546da7625d388e3c8d085dfa266fee7b01..2ccebc6fb0b0143c9605ab548662718dacb8b97d 100644 (file)
--- a/include/asm-x86/traps.h
+++ b/include/asm-x86/traps.h
@@ -1,5 +1,5 @@
-#ifndef _ASM_X86_TRAPS_H
-#define _ASM_X86_TRAPS_H
+#ifndef ASM_X86__TRAPS_H
+#define ASM_X86__TRAPS_H
 
 /* Common in X86_32 and X86_64 */
 asmlinkage void divide_error(void);
@@ -67,4 +67,4 @@ asmlinkage void do_spurious_interrupt_bug(struct pt_regs *);
 asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code);
 
 #endif /* CONFIG_X86_32 */
-#endif /* _ASM_X86_TRAPS_H */
+#endif /* ASM_X86__TRAPS_H */