Merge branches 'release' and 'stats' into release

[sfrench/cifs-2.6.git] / include / asm-h8300 / io.h

diff --git a/include/asm-h8300/io.h b/include/asm-h8300/io.h
index 7543a57b4ea13dce3ba67355eb161f8b14ce305f..26dc6ccd9441a2237ada1f7168131f07402949a9 100644 (file)
--- a/include/asm-h8300/io.h
+++ b/include/asm-h8300/io.h
@@ -302,8 +302,6 @@ static __inline__ void ctrl_outl(unsigned long b, unsigned long addr)
 /*
  * Macros used for converting between virtual and physical mappings.
  */
-#define mm_ptov(vaddr)         ((void *) (vaddr))
-#define mm_vtop(vaddr)         ((unsigned long) (vaddr))
 #define phys_to_virt(vaddr)    ((void *) (vaddr))
 #define virt_to_phys(vaddr)    ((unsigned long) (vaddr))