From 7c7f1a761ba5fc7514cf63cd62050477606d0b9a Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Sat, 23 Sep 2006 01:33:40 +0100
Subject: [PATCH] --- yaml --- r: 36511 b: refs/heads/master c:
 cc3afe6f856054a3752ef2b3ccc5eebf33bd5024 h: refs/heads/master i:   36509:
 1dd83fdf7d8e8088720a8dea962bd76e30838a38   36507:
 177f5a96d9e7a23720b6b77c6472b2de64592ad1   36503:
 b55946edb5562454c8fbbced6c3ed55dc5497faf   36495:
 7e9f808998977a76a409d2b088164672e3a92e1d   36479:
 769150ccd069340d8ef7047c47e6cf582336696f v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/s2io.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 1d7961924d50..e4fd0d20eb74 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c5649af3accc7f2941c5eebcc613e1a81b03448
+refs/heads/master: cc3afe6f856054a3752ef2b3ccc5eebf33bd5024
diff --git a/trunk/drivers/net/s2io.c b/trunk/drivers/net/s2io.c
index c50f4bf34202..1bf23e41f580 100644
--- a/trunk/drivers/net/s2io.c
+++ b/trunk/drivers/net/s2io.c
@@ -2904,7 +2904,7 @@ static void s2io_mdio_write(u32 mmd_type, u64 addr, u16 value, struct net_device
 {
 	u64 val64 = 0x0;
 	nic_t *sp = dev->priv;
-	XENA_dev_config_t *bar0 = (XENA_dev_config_t *)sp->bar0;
+	XENA_dev_config_t __iomem *bar0 = sp->bar0;
 
 	//address transaction
 	val64 = val64 | MDIO_MMD_INDX_ADDR(addr)
@@ -2953,7 +2953,7 @@ static u64 s2io_mdio_read(u32 mmd_type, u64 addr, struct net_device *dev)
 	u64 val64 = 0x0;
 	u64 rval64 = 0x0;
 	nic_t *sp = dev->priv;
-	XENA_dev_config_t *bar0 = (XENA_dev_config_t *)sp->bar0;
+	XENA_dev_config_t __iomem *bar0 = sp->bar0;
 
 	/* address transaction */
 	val64 = val64 | MDIO_MMD_INDX_ADDR(addr)
@@ -3276,7 +3276,7 @@ static void alarm_intr_handler(struct s2io_nic *nic)
  *   SUCCESS on success and FAILURE on failure.
  */
 
-static int wait_for_cmd_complete(void *addr, u64 busy_bit)
+static int wait_for_cmd_complete(void __iomem *addr, u64 busy_bit)
 {
 	int ret = FAILURE, cnt = 0;
 	u64 val64;