Merge branches 'x86/xen', 'x86/build', 'x86/microcode', 'x86/mm-debug-v2', 'x86/memor...

[net-next-2.6.git] / include / asm-x86 / boot.h

diff --git a/include/asm-x86/boot.h b/include/asm-x86/boot.h
index 7b287df4ab55e7810570cafae441553f45e7ab25..1d63bd5d59462833cd5a458956c20a2d05618d9e 100644 (file)
--- a/include/asm-x86/boot.h
+++ b/include/asm-x86/boot.h
@@ -1,5 +1,5 @@
-#ifndef _ASM_BOOT_H
-#define _ASM_BOOT_H
+#ifndef ASM_X86__BOOT_H
+#define ASM_X86__BOOT_H
 
 /* Don't touch these, unless you really know what you're doing. */
 #define DEF_SYSSEG     0x1000
@@ -23,4 +23,4 @@
 #define BOOT_STACK_SIZE        0x1000
 #endif
 
-#endif /* _ASM_BOOT_H */
+#endif /* ASM_X86__BOOT_H */