diff options
| author | Auke-Jan H Kok <auke-jan.h.kok@intel.com> | 2006-09-12 10:46:15 -0700 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-12 22:07:09 -0400 |
| commit | d3148ce9a65813a8020473739c200cb63036f84c (patch) | |
| tree | 96be330d1fd69cf19574b44c44e717e891ac2227 /drivers/net/e1000 | |
| parent | 2a69bf428e49c229f8b735ba3de0a91ebd5d7f33 (diff) | |
| download | linux-3.10-d3148ce9a65813a8020473739c200cb63036f84c.tar.gz linux-3.10-d3148ce9a65813a8020473739c200cb63036f84c.tar.bz2 linux-3.10-d3148ce9a65813a8020473739c200cb63036f84c.zip | |
[PATCH] e1000: revert 'e1000: Remove 0x1000 as supported device'
The commit 'e1000: Remove 0x1000 as supported device' (Jeff Kirsher,
673a052fde79ab5e9dce569b0336358812ddba2d) Removes PIC device ID 8086:1000
from the list of supported devices. A fix was submitted for the original
issue (commit 6a9516989f94df10d9a27ba543c6b53b3e69c84a).
This commit reverts commit 673a052fde79ab5e9dce569b0336358812ddba2d and
re-enables 82542rev3 chips completely.
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/e1000')
| -rw-r--r-- | drivers/net/e1000/e1000_main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index dece1838aaf..acf818b1d73 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c @@ -48,6 +48,7 @@ static char e1000_copyright[] = "Copyright (c) 1999-2006 Intel Corporation."; * {PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)} */ static struct pci_device_id e1000_pci_tbl[] = { + INTEL_E1000_ETHERNET_DEVICE(0x1000), INTEL_E1000_ETHERNET_DEVICE(0x1001), INTEL_E1000_ETHERNET_DEVICE(0x1004), INTEL_E1000_ETHERNET_DEVICE(0x1008), |