From 99ab979c8ad268c97c8e474b7281f5c0ade95476 Mon Sep 17 00:00:00 2001
From: Matt Carlson <mcarlson@broadcom.com>
Date: Mon, 13 Feb 2012 10:20:11 +0000
Subject: [PATCH] --- yaml --- r: 290107 b: refs/heads/master c:
 4b40952268c2390a71b9728194eb4b4dd514c087 h: refs/heads/master i:   290105:
 79f5ce820700957ab67cd7b8e5511ce90dd0234c   290103:
 4d1cd815fbe58d8aa0987c1c61bf4307807ba6cf v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/net/ethernet/broadcom/tg3.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e652de315f08..edd1aef0b951 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16c7fa7dfe9a304ca6d5bdf39aa4a8d315336a07
+refs/heads/master: 4b40952268c2390a71b9728194eb4b4dd514c087
diff --git a/trunk/drivers/net/ethernet/broadcom/tg3.c b/trunk/drivers/net/ethernet/broadcom/tg3.c
index cc092170dfa3..b89c9322c0a4 100644
--- a/trunk/drivers/net/ethernet/broadcom/tg3.c
+++ b/trunk/drivers/net/ethernet/broadcom/tg3.c
@@ -2709,9 +2709,6 @@ static int tg3_5700_link_polarity(struct tg3 *tp, u32 speed)
 	return 0;
 }
 
-static int tg3_setup_phy(struct tg3 *, int);
-static int tg3_halt_cpu(struct tg3 *, u32);
-
 static void tg3_power_down_phy(struct tg3 *tp, bool do_low_power)
 {
 	u32 val;
@@ -3514,6 +3511,8 @@ static int tg3_power_up(struct tg3 *tp)
 	return err;
 }
 
+static int tg3_setup_phy(struct tg3 *, int);
+
 static int tg3_power_down_prepare(struct tg3 *tp)
 {
 	u32 misc_host_ctrl;