From f7d9355108d3492d8a7eb72689c9df66e915de97 Mon Sep 17 00:00:00 2001
From: Stephen Boyd <sboyd@codeaurora.org>
Date: Tue, 4 Sep 2012 20:04:35 +0100
Subject: [PATCH] --- yaml --- r: 322631 b: refs/heads/master c:
 b4ad51559c2f12c34a0340b26ffb02e4b285bc51 h: refs/heads/master i:   322629:
 fc1152b1e9b961c03999be1d6b81f894e884f812   322627:
 68312e73345201be34779d8c239e8e3a2908ca3a   322623:
 8b6359d9a96e5769dd0e9bd377be4b04d9ac2b86 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/arm/include/asm/memory.h | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e0304131d7ef..ac62823cc43f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36418c516b31bff4ff949c7c618430a1a514debe
+refs/heads/master: b4ad51559c2f12c34a0340b26ffb02e4b285bc51
diff --git a/trunk/arch/arm/include/asm/memory.h b/trunk/arch/arm/include/asm/memory.h
index e965f1b560f1..5f6ddcc56452 100644
--- a/trunk/arch/arm/include/asm/memory.h
+++ b/trunk/arch/arm/include/asm/memory.h
@@ -187,6 +187,7 @@ static inline unsigned long __phys_to_virt(unsigned long x)
 #define __phys_to_virt(x)	((x) - PHYS_OFFSET + PAGE_OFFSET)
 #endif
 #endif
+#endif /* __ASSEMBLY__ */
 
 #ifndef PHYS_OFFSET
 #ifdef PLAT_PHYS_OFFSET
@@ -196,6 +197,8 @@ static inline unsigned long __phys_to_virt(unsigned long x)
 #endif
 #endif
 
+#ifndef __ASSEMBLY__
+
 /*
  * PFNs are used to describe any physical page; this means
  * PFN 0 == physical address 0.