---

yaml --- r: 145674 b: refs/heads/master c: 83c4832 h: refs/heads/master v: v3
git-mirror · Apr 30, 2009 · b671f06 · b671f06
1 parent fe6c625
commit b671f06
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd0731944333db6e9e91b6954c6ef95f4b71ab04
+refs/heads/master: 83c4832683bc8ebcd1687b3c0bf3ba1ab253dd4f
diff --git a/trunk/arch/x86/boot/compressed/vmlinux.lds.S b/trunk/arch/x86/boot/compressed/vmlinux.lds.S
@@ -1,5 +1,7 @@
 OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT)
 
+#undef i386
+
 #ifdef CONFIG_X86_64
 OUTPUT_ARCH(i386:x86-64)
 ENTRY(startup_64)