From e9afcfd109391fa46e2ae6aedc2a8a9dd42d63d9 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Tue, 11 Sep 2007 08:50:40 +0100
Subject: [PATCH] --- yaml --- r: 65200 b: refs/heads/master c:
 9ae6399f0178c49a6e9cb7562ecc2f7d10c9f195 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/include/asm-mips/page.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 58a4397de746..f7f65743b806 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8998737bd56e65d5e7326b515769c20dc01cb63
+refs/heads/master: 9ae6399f0178c49a6e9cb7562ecc2f7d10c9f195
diff --git a/trunk/include/asm-mips/page.h b/trunk/include/asm-mips/page.h
index b92dd8c760da..e3301e54d559 100644
--- a/trunk/include/asm-mips/page.h
+++ b/trunk/include/asm-mips/page.h
@@ -142,7 +142,7 @@ typedef struct { unsigned long pgprot; } pgprot_t;
 /*
  * __pa()/__va() should be used only during mem init.
  */
-#if defined(CONFIG_64BIT) && !defined(CONFIG_BUILD_ELF64)
+#ifdef CONFIG_64BIT
 #define __pa(x)								\
 ({									\
     unsigned long __x = (unsigned long)(x);				\