diff --git a/[refs] b/[refs]
index 98dd301d3077..a17f20974d75 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72e8d6bbc151ca670c66d58a37e5bbfbc041db69
+refs/heads/master: 53ccce2395cdc3693c22b9a94764b66dc1a4fcb4
diff --git a/trunk/drivers/net/ehea/ehea.h b/trunk/drivers/net/ehea/ehea.h
index 87c510f22aca..23b451a8ae12 100644
--- a/trunk/drivers/net/ehea/ehea.h
+++ b/trunk/drivers/net/ehea/ehea.h
@@ -39,7 +39,7 @@
 #include <asm/io.h>
 
 #define DRV_NAME	"ehea"
-#define DRV_VERSION	"EHEA_0027"
+#define DRV_VERSION	"EHEA_0028"
 
 #define EHEA_MSG_DEFAULT (NETIF_MSG_LINK | NETIF_MSG_TIMER \
 	| NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR)
diff --git a/trunk/drivers/net/ehea/ehea_hw.h b/trunk/drivers/net/ehea/ehea_hw.h
index e3a7d07f88cc..1246757f2c22 100644
--- a/trunk/drivers/net/ehea/ehea_hw.h
+++ b/trunk/drivers/net/ehea/ehea_hw.h
@@ -189,20 +189,25 @@ struct ehea_eqtemm {
 	u64 eqx_it;
 };
 
+/*
+ * These access functions will be changed when the dissuccsion about
+ * the new access methods for POWER has settled.
+ */
+
 static inline u64 epa_load(struct h_epa epa, u32 offset)
 {
-	return readq((void __iomem *)(epa.addr + offset));
+	return __raw_readq((void __iomem *)(epa.addr + offset));
 }
 
 static inline void epa_store(struct h_epa epa, u32 offset, u64 value)
 {
-	writeq(value, (void __iomem *)(epa.addr + offset));
+	__raw_writeq(value, (void __iomem *)(epa.addr + offset));
 	epa_load(epa, offset);	/* synchronize explicitly to eHEA */
 }
 
 static inline void epa_store_acc(struct h_epa epa, u32 offset, u64 value)
 {
-	writeq(value, (void __iomem *)(epa.addr + offset));
+	__raw_writeq(value, (void __iomem *)(epa.addr + offset));
 }
 
 #define epa_store_eq(epa, offset, value)\