From c369b172f252ce69f45ca68d4269ff805f268877 Mon Sep 17 00:00:00 2001
From: Mark Lord <mlord@pobox.com>
Date: Thu, 8 Nov 2007 22:29:07 +0100
Subject: [PATCH] --- yaml --- r: 73468 b: refs/heads/master c:
 50d84c2dc00e48ff9ba018ed0dd23276cf79e566 h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/net/r8169.c | 16 ----------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 3e6848c7bdc9..f3f490eacd6e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a37a68dab77c234c80a8e25455d568f30e86c09
+refs/heads/master: 50d84c2dc00e48ff9ba018ed0dd23276cf79e566
diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c
index a37cf82b9ea7..f9ba2e478a69 100644
--- a/trunk/drivers/net/r8169.c
+++ b/trunk/drivers/net/r8169.c
@@ -1247,16 +1247,6 @@ static void rtl8169sb_hw_phy_config(void __iomem *ioaddr)
 
 	rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));
 }
-static void rtl8168b_hw_phy_config(void __iomem *ioaddr)
-{
-	struct phy_reg phy_reg_init[] = {
-		{ 0x1f, 0x0000 },
-		{ 0x10, 0xf41b },
-		{ 0x1f, 0x0000 }
-	};
-
-	rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));
-}
 
 static void rtl8168cp_hw_phy_config(void __iomem *ioaddr)
 {
@@ -1326,12 +1316,6 @@ static void rtl_hw_phy_config(struct net_device *dev)
 	case RTL_GIGA_MAC_VER_04:
 		rtl8169sb_hw_phy_config(ioaddr);
 		break;
-	case RTL_GIGA_MAC_VER_11:
-	case RTL_GIGA_MAC_VER_12:
-		break;
-	case RTL_GIGA_MAC_VER_17:
-		rtl8168b_hw_phy_config(ioaddr);
-		break;
 	case RTL_GIGA_MAC_VER_18:
 		rtl8168cp_hw_phy_config(ioaddr);
 		break;