diff --git a/[refs] b/[refs]
index f64574c60925..22c00b36fa3c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 322f74a432f976328e834a8663f2e75eb5933ecc
+refs/heads/master: 30ca3e376e82cc44488b1d377adfb10b5818548e
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index b1e8d0698fac..e03d1ae50c3e 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -8059,7 +8059,7 @@ static int tg3_test_link(struct tg3 *tp)
 }
 
 /* Only test the commonly used registers */
-static const int tg3_test_registers(struct tg3 *tp)
+static int tg3_test_registers(struct tg3 *tp)
 {
 	int i, is_5705;
 	u32 offset, read_mask, write_mask, val, save_val, read_val;