| commit | 1fdab81e675c6ef76a49b8aabb7eaf4be51d1b80 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Mon Aug 29 22:05:21 2005 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Mon Aug 29 22:05:21 2005 -0700 |
| tree | cc2917f41eee3ae7c30195308456a034f5baaa1a | |
| parent | a8e4f435d9ea38bfe9171d7458b2057d440825b1 [diff] | |
| parent | 7ef24b69f9ff4858d7242059fbb19477c10e6dd7 [diff] |
Merge refs/heads/upstream-fixes from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h index 5d92707..bc64d96 100644 --- a/drivers/net/s2io.h +++ b/drivers/net/s2io.h
@@ -762,8 +762,8 @@ { u64 ret = 0; ret = readl(addr + 4); - (u64) ret <<= 32; - (u64) ret |= readl(addr); + ret <<= 32; + ret |= readl(addr); return ret; }