From 48f11f7780017ab92f1f72a86f5be2eb9e545b6c Mon Sep 17 00:00:00 2001
From: Benjamin Li <benli@broadcom.com>
Date: Thu, 18 Sep 2008 16:38:24 -0700
Subject: [PATCH] --- yaml --- r: 111672 b: refs/heads/master c:
 344478db5385194ec27f6aaf780ea21c4b4ff02c h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 15aba257e800..b52b421d9498 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d286600e199aa2f1058a1f883d234e73626304d2
+refs/heads/master: 344478db5385194ec27f6aaf780ea21c4b4ff02c
diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c
index 2486a656f12d..192a24ee3e66 100644
--- a/trunk/drivers/net/bnx2.c
+++ b/trunk/drivers/net/bnx2.c
@@ -1127,7 +1127,7 @@ bnx2_init_all_rx_contexts(struct bnx2 *bp)
 	}
 }
 
-static int
+static void
 bnx2_set_mac_link(struct bnx2 *bp)
 {
 	u32 val;
@@ -1193,8 +1193,6 @@ bnx2_set_mac_link(struct bnx2 *bp)
 
 	if (CHIP_NUM(bp) == CHIP_NUM_5709)
 		bnx2_init_all_rx_contexts(bp);
-
-	return 0;
 }
 
 static void