From 3f7dce7da982cca01f5c1a5eca2928f7eef3cbe6 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 28 Dec 2012 15:18:02 +0100
Subject: [PATCH] --- yaml --- r: 348308 b: refs/heads/master c:
 730b8dfe016dd1e91f73d8d3e6724da91397171c h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/mips/include/asm/page.h | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 90661ee6a3fa..964cb2907ef9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bef9ae3d883ce908d8879fff0cd2c3971f5ee4b4
+refs/heads/master: 730b8dfe016dd1e91f73d8d3e6724da91397171c
diff --git a/trunk/arch/mips/include/asm/page.h b/trunk/arch/mips/include/asm/page.h
index 31ab10f02bad..bf84e48ad669 100644
--- a/trunk/arch/mips/include/asm/page.h
+++ b/trunk/arch/mips/include/asm/page.h
@@ -45,8 +45,6 @@
 #define HUGETLB_PAGE_ORDER	({BUILD_BUG(); 0; })
 #endif /* CONFIG_MIPS_HUGE_TLB_SUPPORT */
 
-#ifndef __ASSEMBLY__
-
 #include <linux/pfn.h>
 #include <asm/io.h>
 
@@ -139,8 +137,6 @@ typedef struct { unsigned long pgprot; } pgprot_t;
  */
 #define ptep_buddy(x)	((pte_t *)((unsigned long)(x) ^ sizeof(pte_t)))
 
-#endif /* !__ASSEMBLY__ */
-
 /*
  * __pa()/__va() should be used only during mem init.
  */