From af217e83dde76c553dfb8248b3637761b78c0596 Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <nico@cam.org>
Date: Fri, 5 Sep 2008 16:05:14 -0400
Subject: [PATCH] --- yaml --- r: 123568 b: refs/heads/master c:
 75f4aa15cf05ce6d99c8261cf57dcd749877fd1c h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c468a389a7df..0ee84749891c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 252d4c276dc0895834af48743579cf19d1fa150b
+refs/heads/master: 75f4aa15cf05ce6d99c8261cf57dcd749877fd1c
diff --git a/trunk/arch/arm/include/asm/memory.h b/trunk/arch/arm/include/asm/memory.h
index 77764301844b..7238b3b50643 100644
--- a/trunk/arch/arm/include/asm/memory.h
+++ b/trunk/arch/arm/include/asm/memory.h
@@ -112,10 +112,8 @@
  * private definitions which should NOT be used outside memory.h
  * files.  Use virt_to_phys/phys_to_virt/__pa/__va instead.
  */
-#ifndef __virt_to_phys
 #define __virt_to_phys(x)	((x) - PAGE_OFFSET + PHYS_OFFSET)
 #define __phys_to_virt(x)	((x) - PHYS_OFFSET + PAGE_OFFSET)
-#endif
 
 /*
  * Convert a physical address to a Page Frame Number and back