diff --git a/[refs] b/[refs]
index 15e60473b24e..8f2f54ededfc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 045236ab190636c989ae8198eca37cfbafc1430b
+refs/heads/master: 022ae414daadb718130679e4eacc105521f11ec7
diff --git a/trunk/include/asm-s390/io.h b/trunk/include/asm-s390/io.h
index dca6a6cc103f..b7ff6afc3caa 100644
--- a/trunk/include/asm-s390/io.h
+++ b/trunk/include/asm-s390/io.h
@@ -17,8 +17,6 @@
 
 #define IO_SPACE_LIMIT 0xffffffff
 
-#define __io_virt(x)            ((void *)(PAGE_OFFSET | (unsigned long)(x)))
-
 /*
  * Change virtual addresses to physical addresses and vv.
  * These are pretty trivial
@@ -37,11 +35,9 @@ static inline unsigned long virt_to_phys(volatile void * address)
 
 static inline void * phys_to_virt(unsigned long address)
 {
-        return __io_virt(address);
+	return (void *) address;
 }
 
-#define mmiowb()	do { } while (0)
-
 /*
  * Convert a physical pointer to a virtual kernel pointer for /dev/mem
  * access