From 01629d201c4044a4f9926b3b82330bdeadb9ee40 Mon Sep 17 00:00:00 2001
From: Michael Chan <mchan@broadcom.com>
Date: Fri, 21 Dec 2007 15:04:49 -0800
Subject: [PATCH] --- yaml --- r: 78431 b: refs/heads/master c:
 2ba582b782071c038b312ea330d3090a39f3c66a h: refs/heads/master i:   78429:
 4b773cd6bc4744ea50385470aa7aefef86d10d71   78427:
 41182a941a02fdde09bf6af5b478ad45277c123e   78423:
 d75e9f076f8fa57c831cc828dc1b480ad5155b2d   78415:
 8cf14081d920f6b120e6f159aac6f7e511bf8cbf   78399:
 5bf4aa120e54965a98699cb3f6b4a461fabe89a0 v: v3

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

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;