Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

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

diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
index 1d63bd5d59462833cd5a458956c20a2d05618d9e..dd61616cb73d1d3aab1bb7d5c2dfd8923ec6e672 100644 (file)
--- a/arch/x86/include/asm/boot.h
+++ b/arch/x86/include/asm/boot.h
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__BOOT_H
-#define ASM_X86__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_X86__BOOT_H */
+#endif /* _ASM_X86_BOOT_H */