---

yaml --- r: 123568 b: refs/heads/master c: 75f4aa1 h: refs/heads/master v: v3
git-mirror · Nov 28, 2008 · af217e8 · af217e8
1 parent 83ab431
commit af217e8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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