From b671f06a2e34245150c35162deee5e8617e06a82 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Thu, 30 Apr 2009 12:03:16 +0200
Subject: [PATCH] --- yaml --- r: 145674 b: refs/heads/master c:
 83c4832683bc8ebcd1687b3c0bf3ba1ab253dd4f h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/x86/boot/compressed/vmlinux.lds.S | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a78875592e87..a2336effe512 100644
--- 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
index ffcb19134bf7..0d26c92d3c7d 100644
--- 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)