e1000/e1000e: Move PCI-Express device IDs over to e1000e

e1000e will from now on support the PCI-Express adapters that
previously were supported by e1000. This support means better
performance and easier debugging from now on for both the old
PCI-X/PCI hardware and PCI-Express adapters.

This patch also moves 3 recently merged device IDs over to e1000e
that are identical to quad-port versions of already existing
dual port versions. With this last bit every former e1000 pci-e
device should work now with e1000e.

Here is a brief list of which gigabit driver to use with which
adapter:

  e1000:
	82540 -> 82547

  e1000e:
	82571 -> 82573
	ich8, ich9       (82562 or 82566)
	es2lan           (80003eslan)

  igb: (not yet merged, only available from e1000.sf.net)
	82575

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 0 insertions, 27 deletions

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 76c0fa690cc..f318634c997 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -73,14 +73,6 @@ static struct pci_device_id e1000_pci_tbl[] = {
         INTEL_E1000_ETHERNET_DEVICE(0x1026),
         INTEL_E1000_ETHERNET_DEVICE(0x1027),
         INTEL_E1000_ETHERNET_DEVICE(0x1028),
-        INTEL_E1000_ETHERNET_DEVICE(0x1049),
-        INTEL_E1000_ETHERNET_DEVICE(0x104A),
-        INTEL_E1000_ETHERNET_DEVICE(0x104B),
-        INTEL_E1000_ETHERNET_DEVICE(0x104C),
-        INTEL_E1000_ETHERNET_DEVICE(0x104D),
-        INTEL_E1000_ETHERNET_DEVICE(0x105E),
-        INTEL_E1000_ETHERNET_DEVICE(0x105F),
-        INTEL_E1000_ETHERNET_DEVICE(0x1060),
         INTEL_E1000_ETHERNET_DEVICE(0x1075),
         INTEL_E1000_ETHERNET_DEVICE(0x1076),
         INTEL_E1000_ETHERNET_DEVICE(0x1077),
@@ -89,28 +81,9 @@ static struct pci_device_id e1000_pci_tbl[] = {
         INTEL_E1000_ETHERNET_DEVICE(0x107A),
         INTEL_E1000_ETHERNET_DEVICE(0x107B),
         INTEL_E1000_ETHERNET_DEVICE(0x107C),
-        INTEL_E1000_ETHERNET_DEVICE(0x107D),
-        INTEL_E1000_ETHERNET_DEVICE(0x107E),
-        INTEL_E1000_ETHERNET_DEVICE(0x107F),
         INTEL_E1000_ETHERNET_DEVICE(0x108A),
-        INTEL_E1000_ETHERNET_DEVICE(0x108B),
-        INTEL_E1000_ETHERNET_DEVICE(0x108C),
-        INTEL_E1000_ETHERNET_DEVICE(0x1096),
-        INTEL_E1000_ETHERNET_DEVICE(0x1098),
         INTEL_E1000_ETHERNET_DEVICE(0x1099),
-        INTEL_E1000_ETHERNET_DEVICE(0x109A),
-        INTEL_E1000_ETHERNET_DEVICE(0x10A4),
-        INTEL_E1000_ETHERNET_DEVICE(0x10A5),
         INTEL_E1000_ETHERNET_DEVICE(0x10B5),
-        INTEL_E1000_ETHERNET_DEVICE(0x10B9),
-        INTEL_E1000_ETHERNET_DEVICE(0x10BA),
-        INTEL_E1000_ETHERNET_DEVICE(0x10BB),
-        INTEL_E1000_ETHERNET_DEVICE(0x10BC),
-        INTEL_E1000_ETHERNET_DEVICE(0x10C4),
-        INTEL_E1000_ETHERNET_DEVICE(0x10C5),
-        INTEL_E1000_ETHERNET_DEVICE(0x10D5),
-        INTEL_E1000_ETHERNET_DEVICE(0x10D9),
-        INTEL_E1000_ETHERNET_DEVICE(0x10DA),
         /* required last entry */
         {0,}
 };