diff --git a/[refs] b/[refs]
index 7e3b5275fbdb..4c1ccdcaa6c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b5103ec2dba07a15861e81cb783dd0fbaed24ed
+refs/heads/master: 8d668bfef68b35f7eedcc70fd5c47cdb24f406cc
diff --git a/trunk/drivers/net/s2io.c b/trunk/drivers/net/s2io.c
index 5cd2291bc0bc..16868b7a5d0a 100644
--- a/trunk/drivers/net/s2io.c
+++ b/trunk/drivers/net/s2io.c
@@ -7220,7 +7220,6 @@ static int s2io_card_up(struct s2io_nic * sp)
 
 	/* Initialise napi */
 	if (config->napi) {
-		int i;
 		if (config->intr_type ==  MSI_X) {
 			for (i = 0; i < sp->config.rx_ring_num; i++)
 				napi_enable(&sp->mac_control.rings[i].napi);