Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-27 02:13:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge refs/heads/upstream-fixes from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

Browse Source
This commit is contained in:
Linus Torvalds 2005-08-29 22:05:21 -07:00
commit 1fdab81e67
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/s2io.h
View File

@ -762,8 +762,8 @@ static inline u64 readq(void __iomem *addr)
{ {
u64 ret = 0; u64 ret = 0;
ret = readl(addr + 4); ret = readl(addr + 4);
(u64) ret <<= 32; ret <<= 32;
(u64) ret |= readl(addr); ret |= readl(addr);
return ret; return ret;
} }