From: Matt Carlson <mcarlson@broadcom.com>
Date: Mon, 13 Feb 2012 10:20:11 +0000 (+0000)
Subject: tg3: Eliminate unneeded prototype
X-Git-Tag: v2.6.39-400.9.0~338^2~175
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a2461017df1c2ed40ec616a2a26efc8111c741da;p=users%2Fjedix%2Flinux-maple.git

tg3: Eliminate unneeded prototype

This patch eliminates the unneeded tg3_halt_cpu() prototype and moves
the tg3_setup_phy() prototype closer to where it is needed.

(cherry picked from commit 4b40952268c2390a71b9728194eb4b4dd514c087)
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
---

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index b4bbeb04aaf7a..da73a9ca031da 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -2713,9 +2713,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;
@@ -3518,6 +3515,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;