diff --git a/[refs] b/[refs]
index e1205b214c1b..d89e79d73007 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48dd643c3b02544994fa091573c2242441a7733f
+refs/heads/master: f8c09377d754f35a135454181b869ab527cc0757
diff --git a/trunk/include/asm-i386/boot.h b/trunk/include/asm-i386/boot.h
index bd024ab4fe53..ed8affbf96cb 100644
--- a/trunk/include/asm-i386/boot.h
+++ b/trunk/include/asm-i386/boot.h
@@ -1,5 +1,5 @@
-#ifndef _LINUX_BOOT_H
-#define _LINUX_BOOT_H
+#ifndef _ASM_BOOT_H
+#define _ASM_BOOT_H
 
 /* Don't touch these, unless you really know what you're doing. */
 #define DEF_INITSEG	0x9000
@@ -17,4 +17,4 @@
 				+ (CONFIG_PHYSICAL_ALIGN - 1)) \
 				& ~(CONFIG_PHYSICAL_ALIGN - 1))
 
-#endif /* _LINUX_BOOT_H */
+#endif /* _ASM_BOOT_H */