---

yaml --- r: 376562 b: refs/heads/master c: 576ebd7 h: refs/heads/master v: v3
git-mirror · May 22, 2013 · c268550 · c268550
1 parent 709a27c
commit c268550
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: abd9a0c36028771a8f397f38bf79bfcf404f957f
+refs/heads/master: 576ebd74928fd60ae112b33c42b89602015fadbd
diff --git a/trunk/arch/s390/include/asm/io.h b/trunk/arch/s390/include/asm/io.h
@@ -36,6 +36,7 @@ static inline void * phys_to_virt(unsigned long address)
 }
 
 void *xlate_dev_mem_ptr(unsigned long phys);
+#define xlate_dev_mem_ptr xlate_dev_mem_ptr
 void unxlate_dev_mem_ptr(unsigned long phys, void *addr);
 
 /*

diff --git a/trunk/include/asm-generic/io.h b/trunk/include/asm-generic/io.h
@@ -343,8 +343,12 @@ extern void ioport_unmap(void __iomem *p);
 #endif /* CONFIG_GENERIC_IOMAP */
 #endif /* CONFIG_HAS_IOPORT */
 
+#ifndef xlate_dev_kmem_ptr
 #define xlate_dev_kmem_ptr(p)	p
+#endif
+#ifndef xlate_dev_mem_ptr
 #define xlate_dev_mem_ptr(p)	__va(p)
+#endif
 
 #ifdef CONFIG_VIRT_TO_BUS
 #ifndef virt_to_bus
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,6 +36,7 @@ static inline void * phys_to_virt(unsigned long address) @@
     }
     void *xlate_dev_mem_ptr(unsigned long phys);
+    #define xlate_dev_mem_ptr xlate_dev_mem_ptr
     void unxlate_dev_mem_ptr(unsigned long phys, void *addr);
     /*
@@ Expand Down @@