Merge refs/heads/upstream-fixes from master.kernel.org:/pub/scm/linux…

…/kernel/git/jgarzik/netdev-2.6
git-mirror · Aug 30, 2005 · 1fdab81 · 1fdab81
2 parents a8e4f43 + 7ef24b6
commit 1fdab81
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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;
 }