From e9380f2f5ad2d4d3cac968a6f4fe2c4038dd7ba3 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Mon, 7 Jan 2013 14:03:34 +0100
Subject: [PATCH] --- yaml --- r: 348528 b: refs/heads/master c:
 478740a14826c50595649b3dafed71576796dd95 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/s390/include/asm/io.h | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 94e44fd685eb..505303224eb4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80020fbd65c17d3d9e7d80cfd3fa4c57ae7ff765
+refs/heads/master: 478740a14826c50595649b3dafed71576796dd95
diff --git a/trunk/arch/s390/include/asm/io.h b/trunk/arch/s390/include/asm/io.h
index 16c3eb164f4f..27cb32185ce1 100644
--- a/trunk/arch/s390/include/asm/io.h
+++ b/trunk/arch/s390/include/asm/io.h
@@ -85,6 +85,11 @@ static inline void iounmap(volatile void __iomem *addr)
 #define __raw_writel	zpci_write_u32
 #define __raw_writeq	zpci_write_u64
 
+#define readb_relaxed	readb
+#define readw_relaxed	readw
+#define readl_relaxed	readl
+#define readq_relaxed	readq
+
 #endif /* CONFIG_PCI */
 
 #include <asm-generic/io.h>