kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

e1000: remove PCI Express device IDs

Browse source 
We do not want to prolong the situation much longer that e1000
and e1000e support these devices at the same time. As a result,
take out the bandage that was added for the interim period
and remove all the PCI Express device IDs from e1000.

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Auke Kok 2008-06-22 15:21:29 -07:00 committed by Jeff Garzik
parent 177db6ffd0
commit d03157babe
2 changed files with 0 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/net/Kconfig
View file

@ -2034,9 +2034,6 @@ config E1000E
To compile this driver as a module, choose M here. The module To compile this driver as a module, choose M here. The module
will be called e1000e. will be called e1000e.
config E1000E_ENABLED
def_bool E1000E != n
config IP1000 config IP1000
tristate "IP1000 Gigabit Ethernet support" tristate "IP1000 Gigabit Ethernet support"
depends on PCI && EXPERIMENTAL depends on PCI && EXPERIMENTAL

33
drivers/net/e1000/e1000_main.c
View file

@ -47,12 +47,6 @@ static const char e1000_copyright[] = "Copyright (c) 1999-2006 Intel Corporation
* Macro expands to... * Macro expands to...
* {PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)} * {PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}
*/ */
#ifdef CONFIG_E1000E_ENABLED
#define PCIE(x)
#else
#define PCIE(x) x,
#endif
static struct pci_device_id e1000_pci_tbl[] = { static struct pci_device_id e1000_pci_tbl[] = {
INTEL_E1000_ETHERNET_DEVICE(0x1000), INTEL_E1000_ETHERNET_DEVICE(0x1000),
INTEL_E1000_ETHERNET_DEVICE(0x1001), INTEL_E1000_ETHERNET_DEVICE(0x1001),
@ -79,14 +73,6 @@ static struct pci_device_id e1000_pci_tbl[] = {
INTEL_E1000_ETHERNET_DEVICE(0x1026), INTEL_E1000_ETHERNET_DEVICE(0x1026),
INTEL_E1000_ETHERNET_DEVICE(0x1027), INTEL_E1000_ETHERNET_DEVICE(0x1027),
INTEL_E1000_ETHERNET_DEVICE(0x1028), INTEL_E1000_ETHERNET_DEVICE(0x1028),
PCIE( INTEL_E1000_ETHERNET_DEVICE(0x1049))
PCIE( INTEL_E1000_ETHERNET_DEVICE(0x104A))
PCIE( INTEL_E1000_ETHERNET_DEVICE(0x104B))
PCIE( INTEL_E1000_ETHERNET_DEVICE(0x104C))
PCIE( INTEL_E1000_ETHERNET_DEVICE(0x104D))
PCIE( INTEL_E1000_ETHERNET_DEVICE(0x105E))
PCIE( INTEL_E1000_ETHERNET_DEVICE(0x105F))
PCIE( INTEL_E1000_ETHERNET_DEVICE(0x1060))
INTEL_E1000_ETHERNET_DEVICE(0x1075), INTEL_E1000_ETHERNET_DEVICE(0x1075),
INTEL_E1000_ETHERNET_DEVICE(0x1076), INTEL_E1000_ETHERNET_DEVICE(0x1076),
INTEL_E1000_ETHERNET_DEVICE(0x1077), INTEL_E1000_ETHERNET_DEVICE(0x1077),
@ -95,28 +81,9 @@ PCIE( INTEL_E1000_ETHERNET_DEVICE(0x1060))
INTEL_E1000_ETHERNET_DEVICE(0x107A), INTEL_E1000_ETHERNET_DEVICE(0x107A),
INTEL_E1000_ETHERNET_DEVICE(0x107B), INTEL_E1000_ETHERNET_DEVICE(0x107B),
INTEL_E1000_ETHERNET_DEVICE(0x107C), INTEL_E1000_ETHERNET_DEVICE(0x107C),
PCIE( INTEL_E1000_ETHERNET_DEVICE(0x107D))
PCIE( INTEL_E1000_ETHERNET_DEVICE(0x107E))
PCIE( INTEL_E1000_ETHERNET_DEVICE(0x107F))
INTEL_E1000_ETHERNET_DEVICE(0x108A), INTEL_E1000_ETHERNET_DEVICE(0x108A),
PCIE( INTEL_E1000_ETHERNET_DEVICE(0x108B))
PCIE( INTEL_E1000_ETHERNET_DEVICE(0x108C))
PCIE( INTEL_E1000_ETHERNET_DEVICE(0x1096))
PCIE( INTEL_E1000_ETHERNET_DEVICE(0x1098))
INTEL_E1000_ETHERNET_DEVICE(0x1099), INTEL_E1000_ETHERNET_DEVICE(0x1099),
PCIE( INTEL_E1000_ETHERNET_DEVICE(0x109A))
PCIE( INTEL_E1000_ETHERNET_DEVICE(0x10A4))
PCIE( INTEL_E1000_ETHERNET_DEVICE(0x10A5))
INTEL_E1000_ETHERNET_DEVICE(0x10B5), INTEL_E1000_ETHERNET_DEVICE(0x10B5),
PCIE( INTEL_E1000_ETHERNET_DEVICE(0x10B9))
PCIE( INTEL_E1000_ETHERNET_DEVICE(0x10BA))
PCIE( INTEL_E1000_ETHERNET_DEVICE(0x10BB))
PCIE( INTEL_E1000_ETHERNET_DEVICE(0x10BC))
PCIE( INTEL_E1000_ETHERNET_DEVICE(0x10C4))
PCIE( INTEL_E1000_ETHERNET_DEVICE(0x10C5))
PCIE( INTEL_E1000_ETHERNET_DEVICE(0x10D5))
PCIE( INTEL_E1000_ETHERNET_DEVICE(0x10D9))
PCIE( INTEL_E1000_ETHERNET_DEVICE(0x10DA))
/* required last entry */ /* required last entry */
{0,} {0,}
}; };