projects
/
deliverable
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2a69bf4
)
[PATCH] e1000: revert 'e1000: Remove 0x1000 as supported device'
author
Auke-Jan H Kok
<auke-jan.h.kok@intel.com>
Tue, 12 Sep 2006 17:46:15 +0000
(10:46 -0700)
committer
Jeff Garzik
<jeff@garzik.org>
Wed, 13 Sep 2006 02:07:09 +0000
(22:07 -0400)
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>
drivers/net/e1000/e1000_main.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/net/e1000/e1000_main.c
b/drivers/net/e1000/e1000_main.c
index dece1838aaf54a58cec7d492e735087d51cf7cf9..acf818b1d73bd1bbfc6176637f182e430309adf5 100644
(file)
--- 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),
This page took
0.027439 seconds
and
5
git commands to generate.