aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-08-29 22:05:21 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-29 22:05:21 -0700
commit1fdab81e675c6ef76a49b8aabb7eaf4be51d1b80 (patch)
treecc2917f41eee3ae7c30195308456a034f5baaa1a /drivers/net
parenta8e4f435d9ea38bfe9171d7458b2057d440825b1 (diff)
parent7ef24b69f9ff4858d7242059fbb19477c10e6dd7 (diff)
Merge refs/heads/upstream-fixes from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/s2io.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h
index 5d9270730ca..bc64d967f08 100644
--- a/drivers/net/s2io.h
+++ b/drivers/net/s2io.h
@@ -762,8 +762,8 @@ static inline u64 readq(void __iomem *addr)
{
u64 ret = 0;
ret = readl(addr + 4);
- (u64) ret <<= 32;
- (u64) ret |= readl(addr);
+ ret <<= 32;
+ ret |= readl(addr);
return ret;
}