diff --git a/[refs] b/[refs]
index bbf97144a5a3..bda4f49d7a80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e351064b16914e4843248355288b777fa559947
+refs/heads/master: 7d809ba3f98b8aa8f9ba0dcdf6349958a0b77b7b
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);				\