diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-30 01:05:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-30 01:05:21 -0400 |
| commit | 1fdab81e675c6ef76a49b8aabb7eaf4be51d1b80 (patch) | |
| 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
| -rw-r--r-- | drivers/net/s2io.h | 4 |
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) | |||
| 762 | { | 762 | { |
| 763 | u64 ret = 0; | 763 | u64 ret = 0; |
| 764 | ret = readl(addr + 4); | 764 | ret = readl(addr + 4); |
| 765 | (u64) ret <<= 32; | 765 | ret <<= 32; |
| 766 | (u64) ret |= readl(addr); | 766 | ret |= readl(addr); |
| 767 | 767 | ||
| 768 | return ret; | 768 | return ret; |
| 769 | } | 769 | } |