Commit 7ef24b69 authored by Andrew Morton's avatar Andrew Morton Committed by Jeff Garzik

[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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 8f3d17fb
...@@ -762,8 +762,8 @@ static inline u64 readq(void __iomem *addr) ...@@ -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;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment