diff --git a/[refs] b/[refs]
index 52f7218a4451..7c02e144dd12 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f68ec0c24755e5cdb779be6240925f2175311d84
+refs/heads/master: ba31a5f88b6f907e715ff43db06403e12465b703
diff --git a/trunk/include/asm-x86/boot.h b/trunk/include/asm-x86/boot.h
index 2faed7ecb092..7b287df4ab55 100644
--- a/trunk/include/asm-x86/boot.h
+++ b/trunk/include/asm-x86/boot.h
@@ -2,9 +2,7 @@
 #define _ASM_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 */