diff options
| author | Andi Kleen <ak@suse.de> | 2005-01-10 12:57:56 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-01-10 12:57:56 -0500 |
| commit | e316734c3708c651ec8a5d5219d584f621dd4869 (patch) | |
| tree | 41ea986863777b8d8b5f4ca7e33bcf348c5ba3a8 /drivers | |
| parent | ed01e3128ba207dd8ac07682369f3719672534e7 (diff) | |
| download | history-e316734c3708c651ec8a5d5219d584f621dd4869.tar.gz | |
[PATCH] Fix gcc4 compilation in s2io net driver
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'drivers')
| -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 d2deaaf5d98bab..b4cc65dbf2a795 100644 --- a/drivers/net/s2io.h +++ b/drivers/net/s2io.h @@ -740,8 +740,8 @@ static inline u64 readq(void *addr) { u64 ret = 0; ret = readl(addr + 4); - (u64) ret <<= 32; - (u64) ret |= readl(addr); + ret <<= 32; + ret |= readl(addr); return ret; } |