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

Commit a3aa1884 authored Jan 07, 2010 by Alexey Dobriyan Committed by David S. Miller Jan 07, 2010

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()



Use DEFINE_PCI_DEVICE_TABLE() so we get place PCI ids table into correct section
in every case.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 108316c1

drivers/net/3c59x.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -375,7 +375,7 @@ static struct vortex_chip_info {
	};		};


	static struct pci_device_id vortex_pci_tbl[] = {		static DEFINE_PCI_DEVICE_TABLE(vortex_pci_tbl) = {
	{ 0x10B7, 0x5900, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C590 },		{ 0x10B7, 0x5900, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C590 },
	{ 0x10B7, 0x5920, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C592 },		{ 0x10B7, 0x5920, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C592 },
	{ 0x10B7, 0x5970, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C597 },		{ 0x10B7, 0x5970, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C597 },

drivers/net/8139cp.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -394,7 +394,7 @@ static int cp_get_eeprom(struct net_device *dev,
	static int cp_set_eeprom(struct net_device *dev,		static int cp_set_eeprom(struct net_device *dev,
	struct ethtool_eeprom eeprom, u8 data);		struct ethtool_eeprom eeprom, u8 data);

	static struct pci_device_id cp_pci_tbl[] = {		static DEFINE_PCI_DEVICE_TABLE(cp_pci_tbl) = {
	{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK, PCI_DEVICE_ID_REALTEK_8139), },		{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK, PCI_DEVICE_ID_REALTEK_8139), },
	{ PCI_DEVICE(PCI_VENDOR_ID_TTTECH, PCI_DEVICE_ID_TTTECH_MC322), },		{ PCI_DEVICE(PCI_VENDOR_ID_TTTECH, PCI_DEVICE_ID_TTTECH_MC322), },
	{ },		{ },

drivers/net/8139too.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -231,7 +231,7 @@ static const struct {
	};		};


	static const struct pci_device_id rtl8139_pci_tbl[] = {		static DEFINE_PCI_DEVICE_TABLE(rtl8139_pci_tbl) = {
	{0x10ec, 0x8139, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },		{0x10ec, 0x8139, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
	{0x10ec, 0x8138, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },		{0x10ec, 0x8138, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
	{0x1113, 0x1211, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },		{0x1113, 0x1211, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },

drivers/net/acenic.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -134,7 +134,7 @@
	#define PCI_DEVICE_ID_SGI_ACENIC 0x0009		#define PCI_DEVICE_ID_SGI_ACENIC 0x0009
	#endif		#endif

	static struct pci_device_id acenic_pci_tbl[] = {		static DEFINE_PCI_DEVICE_TABLE(acenic_pci_tbl) = {
	{ PCI_VENDOR_ID_ALTEON, PCI_DEVICE_ID_ALTEON_ACENIC_FIBRE,		{ PCI_VENDOR_ID_ALTEON, PCI_DEVICE_ID_ALTEON_ACENIC_FIBRE,
	PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_NETWORK_ETHERNET << 8, 0xffff00, },		PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_NETWORK_ETHERNET << 8, 0xffff00, },
	{ PCI_VENDOR_ID_ALTEON, PCI_DEVICE_ID_ALTEON_ACENIC_COPPER,		{ PCI_VENDOR_ID_ALTEON, PCI_DEVICE_ID_ALTEON_ACENIC_COPPER,

drivers/net/amd8111e.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -113,7 +113,7 @@ MODULE_PARM_DESC(coalesce, "Enable or Disable interrupt coalescing, 1: Enable, 0
	module_param_array(dynamic_ipg, bool, NULL, 0);		module_param_array(dynamic_ipg, bool, NULL, 0);
	MODULE_PARM_DESC(dynamic_ipg, "Enable or Disable dynamic IPG, 1: Enable, 0: Disable");		MODULE_PARM_DESC(dynamic_ipg, "Enable or Disable dynamic IPG, 1: Enable, 0: Disable");

	static struct pci_device_id amd8111e_pci_tbl[] = {		static DEFINE_PCI_DEVICE_TABLE(amd8111e_pci_tbl) = {

	{ PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD8111E_7462,		{ PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD8111E_7462,
	PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },