From b751e143a74afbc27f3d6c08bd30ba43903ba764 Mon Sep 17 00:00:00 2001 From: "viro@ftp.linux.org.uk" Date: Tue, 6 Sep 2005 01:36:58 +0100 Subject: [PATCH] --- yaml --- r: 7570 b: refs/heads/master c: 25097d4bda4a554d8b4a9989c7d8bcb67ef53f48 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/forcedeth.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 63b59a3f9010..fcb5abecceec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 269cd3819cf1cc20f9567c4920b59c15751076d3 +refs/heads/master: 25097d4bda4a554d8b4a9989c7d8bcb67ef53f48 diff --git a/trunk/drivers/net/forcedeth.c b/trunk/drivers/net/forcedeth.c index 7d93948aec83..d6eefdb71c17 100644 --- a/trunk/drivers/net/forcedeth.c +++ b/trunk/drivers/net/forcedeth.c @@ -1372,7 +1372,7 @@ static int nv_change_mtu(struct net_device *dev, int new_mtu) /* synchronized against open : rtnl_lock() held by caller */ if (netif_running(dev)) { - u8 *base = get_hwbase(dev); + u8 __iomem *base = get_hwbase(dev); /* * It seems that the nic preloads valid ring entries into an * internal buffer. The procedure for flushing everything is @@ -1423,7 +1423,7 @@ static int nv_change_mtu(struct net_device *dev, int new_mtu) static void nv_copy_mac_to_hw(struct net_device *dev) { - u8 *base = get_hwbase(dev); + u8 __iomem *base = get_hwbase(dev); u32 mac[2]; mac[0] = (dev->dev_addr[0] << 0) + (dev->dev_addr[1] << 8) +