diff options
| author |   Andrew Morton <akpm@osdl.org> | 2005-08-25 17:14:46 -0700 |
|---|---|---|
| committer |   Jeff Garzik <jgarzik@pobox.com> | 2005-08-30 00:37:35 -0400 |
| commit | 7ef24b69f9ff4858d7242059fbb19477c10e6dd7 (patch) | |
| tree | 13b7016d033a58aa9688155c2c6c5659b2491808 /drivers/net/s2io.h | |
| parent | Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff) | |
| download | linux-dev-7ef24b69f9ff4858d7242059fbb19477c10e6dd7.tar.xz linux-dev-7ef24b69f9ff4858d7242059fbb19477c10e6dd7.zip | |
[PATCH] s2io build fix
Damir Perisa <damir.perisa@solnet.ch> reports:
drivers/net/s2io.h:765: error: invalid lvalue in assignment
drivers/net/s2io.h:766: error: invalid lvalue in assignment
That's a gcc4 error. I don't see why the casts are there anyway..
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net/s2io.h')
| -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 5d9270730ca2..bc64d967f080 100644 --- 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; } |