Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d03157ba authored by Auke Kok's avatar Auke Kok Committed by Jeff Garzik
Browse files

e1000: remove PCI Express device IDs 



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: default avatarAuke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 177db6ff

drivers/net/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -2034,9 +2034,6 @@ config E1000E 
	  To compile this driver as a module, choose M here. The module

	  will be called e1000e.



config E1000E_ENABLED

	def_bool E1000E != n



config IP1000

	tristate "IP1000 Gigabit Ethernet support"

	depends on PCI && EXPERIMENTAL

drivers/net/e1000/e1000_main.c

+0 −33
Original line number Diff line number Diff line
@@ -47,12 +47,6 @@ static const char e1000_copyright[] = "Copyright (c) 1999-2006 Intel Corporation 
 * Macro expands to...

 *   {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[] = {

	INTEL_E1000_ETHERNET_DEVICE(0x1000),

	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(0x1027),

	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(0x1076),

	INTEL_E1000_ETHERNET_DEVICE(0x1077),
@@ -95,28 +81,9 @@ PCIE( INTEL_E1000_ETHERNET_DEVICE(0x1060)) 
	INTEL_E1000_ETHERNET_DEVICE(0x107A),

	INTEL_E1000_ETHERNET_DEVICE(0x107B),

	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),

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),

PCIE(	INTEL_E1000_ETHERNET_DEVICE(0x109A))

PCIE(	INTEL_E1000_ETHERNET_DEVICE(0x10A4))

PCIE(	INTEL_E1000_ETHERNET_DEVICE(0x10A5))

	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 */

	{0,}

};