From dc4e22b4b61a338110207f27b0e82c5e49d834c6 Mon Sep 17 00:00:00 2001
From: Hannes Eder <hannes@hanneseder.net>
Date: Sat, 14 Feb 2009 11:12:48 +0000
Subject: [PATCH] --- yaml --- r: 134588 b: refs/heads/master c:
 7c34eb897362a51133222ef4229628469333f4d9 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 32d44ed13b69..ccb6aecdd728 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d7dce76c51a590fdd7616285a96825aa517ede0
+refs/heads/master: 7c34eb897362a51133222ef4229628469333f4d9
diff --git a/trunk/drivers/net/niu.c b/trunk/drivers/net/niu.c
index c26325ded20e..32374a1c123b 100644
--- a/trunk/drivers/net/niu.c
+++ b/trunk/drivers/net/niu.c
@@ -2284,7 +2284,6 @@ static int serdes_init_10g_serdes(struct niu *np)
 	struct niu_link_config *lp = &np->link_config;
 	unsigned long ctrl_reg, test_cfg_reg, pll_cfg, i;
 	u64 ctrl_val, test_cfg_val, sig, mask, val;
-	int err;
 	u64 reset_val;
 
 	switch (np->port) {
@@ -2337,6 +2336,7 @@ static int serdes_init_10g_serdes(struct niu *np)
 	/* Initialize all 4 lanes of the SERDES.  */
 	for (i = 0; i < 4; i++) {
 		u32 rxtx_ctrl, glue0;
+		int err;
 
 		err = esr_read_rxtx_ctrl(np, i, &rxtx_ctrl);
 		if (err)