From 72b6f7dd78e26fd1cbd9fc3be957d6fd51903bcc Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Wed, 12 Nov 2008 14:32:54 -0800
Subject: [PATCH] --- yaml --- r: 118890 b: refs/heads/master c:
 e23a59e1ca6d177a57a7791b3629db93ff1d9813 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/niu.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 033b623448f9..d7ced117a6bf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d35aac10eb7bcb3b80bef16b60844af0313f47f7
+refs/heads/master: e23a59e1ca6d177a57a7791b3629db93ff1d9813
diff --git a/trunk/drivers/net/niu.c b/trunk/drivers/net/niu.c
index 9acb5d70a3ae..d8463b1c3df3 100644
--- a/trunk/drivers/net/niu.c
+++ b/trunk/drivers/net/niu.c
@@ -51,8 +51,7 @@ MODULE_VERSION(DRV_MODULE_VERSION);
 #ifndef readq
 static u64 readq(void __iomem *reg)
 {
-	return (((u64)readl(reg + 0x4UL) << 32) |
-		(u64)readl(reg));
+	return ((u64) readl(reg)) | (((u64) readl(reg + 4UL)) << 32);
 }
 
 static void writeq(u64 val, void __iomem *reg)