diff options
-rw-r--r-- | drivers/net/Kconfig | 2 | ||||
-rw-r--r-- | drivers/net/e1000/e1000_main.c | 27 |
2 files changed, 28 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index af40ff434def..5a2d1dd487f6 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -1992,7 +1992,7 @@ config E1000_DISABLE_PACKET_SPLIT | |||
1992 | 1992 | ||
1993 | config E1000E | 1993 | config E1000E |
1994 | tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support" | 1994 | tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support" |
1995 | depends on PCI | 1995 | depends on PCI && EXPERIMENTAL |
1996 | ---help--- | 1996 | ---help--- |
1997 | This driver supports the PCI-Express Intel(R) PRO/1000 gigabit | 1997 | This driver supports the PCI-Express Intel(R) PRO/1000 gigabit |
1998 | ethernet family of adapters. For PCI or PCI-X e1000 adapters, | 1998 | ethernet family of adapters. For PCI or PCI-X e1000 adapters, |
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 7f5b2ae70d5d..3111af6cdc8a 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
@@ -73,6 +73,14 @@ static struct pci_device_id e1000_pci_tbl[] = { | |||
73 | INTEL_E1000_ETHERNET_DEVICE(0x1026), | 73 | INTEL_E1000_ETHERNET_DEVICE(0x1026), |
74 | INTEL_E1000_ETHERNET_DEVICE(0x1027), | 74 | INTEL_E1000_ETHERNET_DEVICE(0x1027), |
75 | INTEL_E1000_ETHERNET_DEVICE(0x1028), | 75 | INTEL_E1000_ETHERNET_DEVICE(0x1028), |
76 | INTEL_E1000_ETHERNET_DEVICE(0x1049), | ||
77 | INTEL_E1000_ETHERNET_DEVICE(0x104A), | ||
78 | INTEL_E1000_ETHERNET_DEVICE(0x104B), | ||
79 | INTEL_E1000_ETHERNET_DEVICE(0x104C), | ||
80 | INTEL_E1000_ETHERNET_DEVICE(0x104D), | ||
81 | INTEL_E1000_ETHERNET_DEVICE(0x105E), | ||
82 | INTEL_E1000_ETHERNET_DEVICE(0x105F), | ||
83 | INTEL_E1000_ETHERNET_DEVICE(0x1060), | ||
76 | INTEL_E1000_ETHERNET_DEVICE(0x1075), | 84 | INTEL_E1000_ETHERNET_DEVICE(0x1075), |
77 | INTEL_E1000_ETHERNET_DEVICE(0x1076), | 85 | INTEL_E1000_ETHERNET_DEVICE(0x1076), |
78 | INTEL_E1000_ETHERNET_DEVICE(0x1077), | 86 | INTEL_E1000_ETHERNET_DEVICE(0x1077), |
@@ -81,9 +89,28 @@ static struct pci_device_id e1000_pci_tbl[] = { | |||
81 | INTEL_E1000_ETHERNET_DEVICE(0x107A), | 89 | INTEL_E1000_ETHERNET_DEVICE(0x107A), |
82 | INTEL_E1000_ETHERNET_DEVICE(0x107B), | 90 | INTEL_E1000_ETHERNET_DEVICE(0x107B), |
83 | INTEL_E1000_ETHERNET_DEVICE(0x107C), | 91 | INTEL_E1000_ETHERNET_DEVICE(0x107C), |
92 | INTEL_E1000_ETHERNET_DEVICE(0x107D), | ||
93 | INTEL_E1000_ETHERNET_DEVICE(0x107E), | ||
94 | INTEL_E1000_ETHERNET_DEVICE(0x107F), | ||
84 | INTEL_E1000_ETHERNET_DEVICE(0x108A), | 95 | INTEL_E1000_ETHERNET_DEVICE(0x108A), |
96 | INTEL_E1000_ETHERNET_DEVICE(0x108B), | ||
97 | INTEL_E1000_ETHERNET_DEVICE(0x108C), | ||
98 | INTEL_E1000_ETHERNET_DEVICE(0x1096), | ||
99 | INTEL_E1000_ETHERNET_DEVICE(0x1098), | ||
85 | INTEL_E1000_ETHERNET_DEVICE(0x1099), | 100 | INTEL_E1000_ETHERNET_DEVICE(0x1099), |
101 | INTEL_E1000_ETHERNET_DEVICE(0x109A), | ||
102 | INTEL_E1000_ETHERNET_DEVICE(0x10A4), | ||
103 | INTEL_E1000_ETHERNET_DEVICE(0x10A5), | ||
86 | INTEL_E1000_ETHERNET_DEVICE(0x10B5), | 104 | INTEL_E1000_ETHERNET_DEVICE(0x10B5), |
105 | INTEL_E1000_ETHERNET_DEVICE(0x10B9), | ||
106 | INTEL_E1000_ETHERNET_DEVICE(0x10BA), | ||
107 | INTEL_E1000_ETHERNET_DEVICE(0x10BB), | ||
108 | INTEL_E1000_ETHERNET_DEVICE(0x10BC), | ||
109 | INTEL_E1000_ETHERNET_DEVICE(0x10C4), | ||
110 | INTEL_E1000_ETHERNET_DEVICE(0x10C5), | ||
111 | INTEL_E1000_ETHERNET_DEVICE(0x10D5), | ||
112 | INTEL_E1000_ETHERNET_DEVICE(0x10D9), | ||
113 | INTEL_E1000_ETHERNET_DEVICE(0x10DA), | ||
87 | /* required last entry */ | 114 | /* required last entry */ |
88 | {0,} | 115 | {0,} |
89 | }; | 116 | }; |