aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000/e1000_main.c
diff options
context:
space:
mode:
authorAuke Kok <auke\-jan.h.kok@intel.com>2006-11-01 11:47:56 -0500
committerJeff Garzik <jeff@garzik.org>2006-12-02 00:12:00 -0500
commitfc2307d00c15385fbdbb5928a8517e5f63c3d068 (patch)
tree2636883b950a2ae492f8302773001189dfdd6bfa /drivers/net/e1000/e1000_main.c
parenta9ebadd640927ac6529d904b4131b17e8019d199 (diff)
e1000: New hardware support
Add support for a Low Profile quad-port PCI-E adapter and 2 variants of the ICH8 systems' onboard NIC's. Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Diffstat (limited to 'drivers/net/e1000/e1000_main.c')
-rw-r--r--drivers/net/e1000/e1000_main.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 9d82bbb1a826..96e44a825443 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -103,6 +103,9 @@ static struct pci_device_id e1000_pci_tbl[] = {
103 INTEL_E1000_ETHERNET_DEVICE(0x10B9), 103 INTEL_E1000_ETHERNET_DEVICE(0x10B9),
104 INTEL_E1000_ETHERNET_DEVICE(0x10BA), 104 INTEL_E1000_ETHERNET_DEVICE(0x10BA),
105 INTEL_E1000_ETHERNET_DEVICE(0x10BB), 105 INTEL_E1000_ETHERNET_DEVICE(0x10BB),
106 INTEL_E1000_ETHERNET_DEVICE(0x10BC),
107 INTEL_E1000_ETHERNET_DEVICE(0x10C4),
108 INTEL_E1000_ETHERNET_DEVICE(0x10C5),
106 /* required last entry */ 109 /* required last entry */
107 {0,} 110 {0,}
108}; 111};
@@ -961,6 +964,7 @@ e1000_probe(struct pci_dev *pdev,
961 break; 964 break;
962 case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3: 965 case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
963 case E1000_DEV_ID_82571EB_QUAD_COPPER: 966 case E1000_DEV_ID_82571EB_QUAD_COPPER:
967 case E1000_DEV_ID_82571EB_QUAD_COPPER_LOWPROFILE:
964 /* if quad port adapter, disable WoL on all but port A */ 968 /* if quad port adapter, disable WoL on all but port A */
965 if (global_quad_port_a != 0) 969 if (global_quad_port_a != 0)
966 adapter->eeprom_wol = 0; 970 adapter->eeprom_wol = 0;