diff --git a/[refs] b/[refs]
index 8fd82769fd51..6bb3f6d0fcf1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f13561cb2f97794df43f83d1ee808e46eb5d2405
+refs/heads/master: 2ba582b782071c038b312ea330d3090a39f3c66a
diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c
index aef2a9ac16a2..94d1857d2c5d 100644
--- a/trunk/drivers/net/bnx2.c
+++ b/trunk/drivers/net/bnx2.c
@@ -7313,7 +7313,7 @@ bnx2_bus_string(struct bnx2 *bp, char *str)
 	return str;
 }
 
-static int __devinit
+static void __devinit
 bnx2_init_napi(struct bnx2 *bp)
 {
 	int i;