From 42780da6f34bec2327a342d7d15782e07dacf930 Mon Sep 17 00:00:00 2001
From: Franck Bui-Huu <fbuihuu@gmail.com>
Date: Thu, 15 Feb 2007 12:06:47 +0100
Subject: [PATCH] --- yaml --- r: 66139 b: refs/heads/master c:
 8c67316e706cabc2145d6c8e97f0bd8f2a86d8a1 h: refs/heads/master i:   66137:
 b89569c54d6b8b9b33b766cebc05aac649d44396   66135:
 ada84aec801f8dba5a1ee524e295411c37158792 v: v3

---
 [refs]                   | 2 +-
 trunk/arch/mips/Makefile | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f1242ea1eb11..d6c48efb0c8a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d87d0c930a1591617e4c7c78296b4ba029150188
+refs/heads/master: 8c67316e706cabc2145d6c8e97f0bd8f2a86d8a1
diff --git a/trunk/arch/mips/Makefile b/trunk/arch/mips/Makefile
index 32c1c8fb6f98..d5d5831b6e24 100644
--- a/trunk/arch/mips/Makefile
+++ b/trunk/arch/mips/Makefile
@@ -60,9 +60,7 @@ vmlinux-32		= vmlinux.32
 vmlinux-64		= vmlinux
 
 cflags-y		+= -mabi=64
-ifdef CONFIG_BUILD_ELF64
-cflags-y		+= $(call cc-option,-mno-explicit-relocs)
-else
+ifndef CONFIG_BUILD_ELF64
 cflags-y		+= $(call cc-option,-msym32)
 endif
 endif