summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/dev/pci/if_em_hw.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/sys/dev/pci/if_em_hw.c b/sys/dev/pci/if_em_hw.c
index 143f0a17ad8..52f84d2892c 100644
--- a/sys/dev/pci/if_em_hw.c
+++ b/sys/dev/pci/if_em_hw.c
@@ -31,7 +31,7 @@
*******************************************************************************/
-/* $OpenBSD: if_em_hw.c,v 1.38 2009/09/04 22:13:51 dms Exp $ */
+/* $OpenBSD: if_em_hw.c,v 1.39 2009/10/06 02:01:04 dms Exp $ */
/* if_em_hw.c
* Shared functions for accessing and configuring the MAC
@@ -4246,15 +4246,6 @@ em_detect_gig_phy(struct em_hw *hw)
return E1000_SUCCESS;
}
- /* until something better comes along... makes the Lenovo X200 work */
- if (hw->mac_type == em_ich9lan &&
- (hw->device_id == E1000_DEV_ID_ICH9_IGP_M ||
- hw->device_id == E1000_DEV_ID_ICH9_IGP_M_AMT)) {
- hw->phy_id = IGP03E1000_E_PHY_ID;
- hw->phy_type = em_phy_igp_3;
- return E1000_SUCCESS;
- }
-
/* ESB-2 PHY reads require em_phy_gg82563 to be set because of a work-
* around that forces PHY page 0 to be set or the reads fail. The rest of
* the code in this routine uses em_read_phy_reg to read the PHY ID.