From 9e9815e54b3c3f60e901da4c2033c53794ce02f4 Mon Sep 17 00:00:00 2001
From: Jon Mason <jon.mason@exar.com>
Date: Fri, 10 Dec 2010 15:40:04 +0000
Subject: [PATCH] --- yaml --- r: 225023 b: refs/heads/master c:
 85a564983aff948b9ea8b6e734b3e80b5755d12a h: refs/heads/master i:   225021:
 aeca731697c5bf0985cd1fb7941b56714c6d5d2e   225019:
 1c2ff1be996572411ffa6ead201ecd2fa3a1f969   225015:
 196ad90f0535d3555f49593851dda7ea311782b2   225007:
 e9a13a3ec489c101762c42f84d73717850837618   224991:
 fb4e1ee3703ced3a7989b0bd2619697f1e962b88   224959:
 3dd1b3ea8a807295e1bf7061d216de1db75d6f79   224895:
 c132dfd26cfd59dc7b5362ba042bd8a7f82a6ab0   224767:
 20004d25b44adf1412fffb27785b805b068feacf v: v3

---
 [refs]                   |  2 +-
 trunk/drivers/net/s2io.c | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index d91ff7f09b66..b2a36946b771 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11410b62cf9bdaed5863696c7994286a900424c7
+refs/heads/master: 85a564983aff948b9ea8b6e734b3e80b5755d12a
diff --git a/trunk/drivers/net/s2io.c b/trunk/drivers/net/s2io.c
index 80efc05d4d64..9a1e32fb720b 100644
--- a/trunk/drivers/net/s2io.c
+++ b/trunk/drivers/net/s2io.c
@@ -3598,10 +3598,12 @@ static int s2io_set_swapper(struct s2io_nic *sp)
 	val64 = readq(&bar0->pif_rd_swapper_fb);
 	if (val64 != 0x0123456789ABCDEFULL) {
 		int i = 0;
-		u64 value[] = { 0xC30000C3C30000C3ULL,   /* FE=1, SE=1 */
-				0x8100008181000081ULL,  /* FE=1, SE=0 */
-				0x4200004242000042ULL,  /* FE=0, SE=1 */
-				0};                     /* FE=0, SE=0 */
+		static const u64 value[] = {
+			0xC30000C3C30000C3ULL,	/* FE=1, SE=1 */
+			0x8100008181000081ULL,	/* FE=1, SE=0 */
+			0x4200004242000042ULL,	/* FE=0, SE=1 */
+			0			/* FE=0, SE=0 */
+		};
 
 		while (i < 4) {
 			writeq(value[i], &bar0->swapper_ctrl);
@@ -3627,10 +3629,12 @@ static int s2io_set_swapper(struct s2io_nic *sp)
 
 	if (val64 != valt) {
 		int i = 0;
-		u64 value[] = { 0x00C3C30000C3C300ULL,  /* FE=1, SE=1 */
-				0x0081810000818100ULL,  /* FE=1, SE=0 */
-				0x0042420000424200ULL,  /* FE=0, SE=1 */
-				0};                     /* FE=0, SE=0 */
+		static const u64 value[] = {
+			0x00C3C30000C3C300ULL,	/* FE=1, SE=1 */
+			0x0081810000818100ULL,	/* FE=1, SE=0 */
+			0x0042420000424200ULL,	/* FE=0, SE=1 */
+			0			/* FE=0, SE=0 */
+		};
 
 		while (i < 4) {
 			writeq((value[i] | valr), &bar0->swapper_ctrl);