diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 20:22:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 20:22:43 -0400 |
| commit | 55faed1e607a24ca7f3453a3eb463ca8987f8139 (patch) | |
| tree | 70c1f910576713e799b5b409d9f4c3c56840526e /drivers/net/forcedeth.c | |
| parent | 946e91f36e90eea46758dd725b1c3b239f270f68 (diff) | |
| parent | 0edd5b44913cd0aba6f23b626b407f70bb3fb018 (diff) | |
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/forcedeth.c')
| -rw-r--r-- | drivers/net/forcedeth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index 7d93948aec83..d6eefdb71c17 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c | |||
| @@ -1372,7 +1372,7 @@ static int nv_change_mtu(struct net_device *dev, int new_mtu) | |||
| 1372 | 1372 | ||
| 1373 | /* synchronized against open : rtnl_lock() held by caller */ | 1373 | /* synchronized against open : rtnl_lock() held by caller */ |
| 1374 | if (netif_running(dev)) { | 1374 | if (netif_running(dev)) { |
| 1375 | u8 *base = get_hwbase(dev); | 1375 | u8 __iomem *base = get_hwbase(dev); |
| 1376 | /* | 1376 | /* |
| 1377 | * It seems that the nic preloads valid ring entries into an | 1377 | * It seems that the nic preloads valid ring entries into an |
| 1378 | * internal buffer. The procedure for flushing everything is | 1378 | * internal buffer. The procedure for flushing everything is |
| @@ -1423,7 +1423,7 @@ static int nv_change_mtu(struct net_device *dev, int new_mtu) | |||
| 1423 | 1423 | ||
| 1424 | static void nv_copy_mac_to_hw(struct net_device *dev) | 1424 | static void nv_copy_mac_to_hw(struct net_device *dev) |
| 1425 | { | 1425 | { |
| 1426 | u8 *base = get_hwbase(dev); | 1426 | u8 __iomem *base = get_hwbase(dev); |
| 1427 | u32 mac[2]; | 1427 | u32 mac[2]; |
| 1428 | 1428 | ||
| 1429 | mac[0] = (dev->dev_addr[0] << 0) + (dev->dev_addr[1] << 8) + | 1429 | mac[0] = (dev->dev_addr[0] << 0) + (dev->dev_addr[1] << 8) + |