summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Lord <mlord@pobox.com>2007-11-08 22:29:07 +0100
committerJeff Garzik <jeff@garzik.org>2007-11-10 04:25:15 -0500
commit50d84c2dc00e48ff9ba018ed0dd23276cf79e566 (patch)
treee11c64ce3a27a9676b1ea1522357164b61c3002f
parent5a37a68dab77c234c80a8e25455d568f30e86c09 (diff)
downloadlinux-50d84c2dc00e48ff9ba018ed0dd23276cf79e566.tar.bz2
r8169: revert 7da97ec96a0934319c7fbedd3d38baf533e20640 (bis repetita)
RTL_GIGA_MAC_VER_17 breaks as well. Signed-off-by: Mark Lord <mlord@pobox.com> Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Cc: Edward Hsu <edward_hsu@realtek.com.tw>
-rw-r--r--drivers/net/r8169.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index a37cf82b9ea7..f9ba2e478a69 100644
--- a/drivers/net/r8169.c
+++ b/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;