aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000/e1000_main.c
diff options
context:
space:
mode:
authorJeff Kirsher <jeffrey.t.kirsher@intel.com>2006-03-02 21:21:10 -0500
committerroot <root@jk-desktop.jf.intel.com>2006-03-02 21:21:10 -0500
commit6418ecc68e1d9416451b6f78ebb2c0b077e0abf2 (patch)
tree4fa4a491d559b388e7461192455bd0ebbca5d2b5 /drivers/net/e1000/e1000_main.c
parent2a1af5d7dfd809b16fb69f3f0fc073d9b6b7c6ac (diff)
e1000: Add support for new hardware (ESB2)
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com>
Diffstat (limited to 'drivers/net/e1000/e1000_main.c')
-rw-r--r--drivers/net/e1000/e1000_main.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index e80378a220d4..3acbffd5bde3 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -157,9 +157,12 @@ static struct pci_device_id e1000_pci_tbl[] = {
157 INTEL_E1000_ETHERNET_DEVICE(0x108A), 157 INTEL_E1000_ETHERNET_DEVICE(0x108A),
158 INTEL_E1000_ETHERNET_DEVICE(0x108B), 158 INTEL_E1000_ETHERNET_DEVICE(0x108B),
159 INTEL_E1000_ETHERNET_DEVICE(0x108C), 159 INTEL_E1000_ETHERNET_DEVICE(0x108C),
160 INTEL_E1000_ETHERNET_DEVICE(0x1096),
161 INTEL_E1000_ETHERNET_DEVICE(0x1098),
160 INTEL_E1000_ETHERNET_DEVICE(0x1099), 162 INTEL_E1000_ETHERNET_DEVICE(0x1099),
161 INTEL_E1000_ETHERNET_DEVICE(0x109A), 163 INTEL_E1000_ETHERNET_DEVICE(0x109A),
162 INTEL_E1000_ETHERNET_DEVICE(0x10B5), 164 INTEL_E1000_ETHERNET_DEVICE(0x10B5),
165 INTEL_E1000_ETHERNET_DEVICE(0x10B9),
163 /* required last entry */ 166 /* required last entry */
164 {0,} 167 {0,}
165}; 168};
@@ -575,6 +578,7 @@ e1000_reset(struct e1000_adapter *adapter)
575 break; 578 break;
576 case e1000_82571: 579 case e1000_82571:
577 case e1000_82572: 580 case e1000_82572:
581 case e1000_80003es2lan:
578 pba = E1000_PBA_38K; 582 pba = E1000_PBA_38K;
579 break; 583 break;
580 case e1000_82573: 584 case e1000_82573:
@@ -852,6 +856,7 @@ e1000_probe(struct pci_dev *pdev,
852 case e1000_82546: 856 case e1000_82546:
853 case e1000_82546_rev_3: 857 case e1000_82546_rev_3:
854 case e1000_82571: 858 case e1000_82571:
859 case e1000_80003es2lan:
855 if (E1000_READ_REG(&adapter->hw, STATUS) & E1000_STATUS_FUNC_1){ 860 if (E1000_READ_REG(&adapter->hw, STATUS) & E1000_STATUS_FUNC_1){
856 e1000_read_eeprom(&adapter->hw, 861 e1000_read_eeprom(&adapter->hw,
857 EEPROM_INIT_CONTROL3_PORT_B, 1, &eeprom_data); 862 EEPROM_INIT_CONTROL3_PORT_B, 1, &eeprom_data);