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

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

diff --git a/include/asm-x86/boot.h b/include/asm-x86/boot.h
index 2faed7ecb092a7893c89c573b7ac9870e060d8a7..1d63bd5d59462833cd5a458956c20a2d05618d9e 100644 (file)
--- a/include/asm-x86/boot.h
+++ b/include/asm-x86/boot.h
@@ -1,10 +1,8 @@
-#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_INITSEG    0x9000
 #define DEF_SYSSEG     0x1000
-#define DEF_SETUPSEG   0x9020
 #define DEF_SYSSIZE    0x7F00
 
 /* Internal svga startup constants */
@@ -25,4 +23,4 @@
 #define BOOT_STACK_SIZE        0x1000
 #endif
 
-#endif /* _ASM_BOOT_H */
+#endif /* ASM_X86__BOOT_H */