Merge branches 'release' and 'gpe-ack' into release

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

diff --git a/include/asm-v850/io.h b/include/asm-v850/io.h
index cc364fcbec101aacadd8641c74c5fc9ac7553985..cdad251fba9ff1802d7f311c660f08b0d9fa0d71 100644 (file)
--- a/include/asm-v850/io.h
+++ b/include/asm-v850/io.h
@@ -122,8 +122,6 @@ outsl (unsigned long port, const void *src, unsigned long count)
 #endif
 
 /* Conversion between virtual and physical mappings.  */
-#define mm_ptov(addr)          ((void *)__phys_to_virt (addr))
-#define mm_vtop(addr)          ((unsigned long)__virt_to_phys (addr))
 #define phys_to_virt(addr)     ((void *)__phys_to_virt (addr))
 #define virt_to_phys(addr)     ((unsigned long)__virt_to_phys (addr))