Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[~andy/linux] / drivers / net / s2io.h

diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h
index 5d9270730ca23c9a9a44fa14941f132e94393de9..bc64d967f08094abc2a2145696d8b43be70aec85 100644 (file)
--- 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;
 }