diff options
Diffstat (limited to 'drivers/net/ethernet/qlogic')
-rw-r--r-- | drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/qlogic/qla3xxx.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/qlogic/qlge/qlge_main.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c index 5bf05818a12c..1159031f885b 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c | |||
@@ -99,7 +99,7 @@ static int netxen_nic_set_mac(struct net_device *netdev, void *p); | |||
99 | {PCI_DEVICE(PCI_VENDOR_ID_NETXEN, (device)), \ | 99 | {PCI_DEVICE(PCI_VENDOR_ID_NETXEN, (device)), \ |
100 | .class = PCI_CLASS_NETWORK_ETHERNET << 8, .class_mask = ~0} | 100 | .class = PCI_CLASS_NETWORK_ETHERNET << 8, .class_mask = ~0} |
101 | 101 | ||
102 | static DEFINE_PCI_DEVICE_TABLE(netxen_pci_tbl) = { | 102 | static const struct pci_device_id netxen_pci_tbl[] = { |
103 | ENTRY(PCI_DEVICE_ID_NX2031_10GXSR), | 103 | ENTRY(PCI_DEVICE_ID_NX2031_10GXSR), |
104 | ENTRY(PCI_DEVICE_ID_NX2031_10GCX4), | 104 | ENTRY(PCI_DEVICE_ID_NX2031_10GCX4), |
105 | ENTRY(PCI_DEVICE_ID_NX2031_4GCU), | 105 | ENTRY(PCI_DEVICE_ID_NX2031_4GCU), |
diff --git a/drivers/net/ethernet/qlogic/qla3xxx.c b/drivers/net/ethernet/qlogic/qla3xxx.c index b5d6bc1a8b00..c2f09af5c25b 100644 --- a/drivers/net/ethernet/qlogic/qla3xxx.c +++ b/drivers/net/ethernet/qlogic/qla3xxx.c | |||
@@ -65,7 +65,7 @@ static int msi; | |||
65 | module_param(msi, int, 0); | 65 | module_param(msi, int, 0); |
66 | MODULE_PARM_DESC(msi, "Turn on Message Signaled Interrupts."); | 66 | MODULE_PARM_DESC(msi, "Turn on Message Signaled Interrupts."); |
67 | 67 | ||
68 | static DEFINE_PCI_DEVICE_TABLE(ql3xxx_pci_tbl) = { | 68 | static const struct pci_device_id ql3xxx_pci_tbl[] = { |
69 | {PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, QL3022_DEVICE_ID)}, | 69 | {PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, QL3022_DEVICE_ID)}, |
70 | {PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, QL3032_DEVICE_ID)}, | 70 | {PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, QL3032_DEVICE_ID)}, |
71 | /* required last entry */ | 71 | /* required last entry */ |
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c index 59846daf1379..cf08b2de071e 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | |||
@@ -108,7 +108,7 @@ static u32 qlcnic_vlan_tx_check(struct qlcnic_adapter *adapter) | |||
108 | {PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, (device)), \ | 108 | {PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, (device)), \ |
109 | .class = PCI_CLASS_NETWORK_ETHERNET << 8, .class_mask = ~0} | 109 | .class = PCI_CLASS_NETWORK_ETHERNET << 8, .class_mask = ~0} |
110 | 110 | ||
111 | static DEFINE_PCI_DEVICE_TABLE(qlcnic_pci_tbl) = { | 111 | static const struct pci_device_id qlcnic_pci_tbl[] = { |
112 | ENTRY(PCI_DEVICE_ID_QLOGIC_QLE824X), | 112 | ENTRY(PCI_DEVICE_ID_QLOGIC_QLE824X), |
113 | ENTRY(PCI_DEVICE_ID_QLOGIC_QLE834X), | 113 | ENTRY(PCI_DEVICE_ID_QLOGIC_QLE834X), |
114 | ENTRY(PCI_DEVICE_ID_QLOGIC_VF_QLE834X), | 114 | ENTRY(PCI_DEVICE_ID_QLOGIC_VF_QLE834X), |
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c index d836ace52277..188626e2a861 100644 --- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c +++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c | |||
@@ -86,7 +86,7 @@ MODULE_PARM_DESC(qlge_force_coredump, | |||
86 | "Option to allow force of firmware core dump. " | 86 | "Option to allow force of firmware core dump. " |
87 | "Default is OFF - Do not allow."); | 87 | "Default is OFF - Do not allow."); |
88 | 88 | ||
89 | static DEFINE_PCI_DEVICE_TABLE(qlge_pci_tbl) = { | 89 | static const struct pci_device_id qlge_pci_tbl[] = { |
90 | {PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, QLGE_DEVICE_ID_8012)}, | 90 | {PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, QLGE_DEVICE_ID_8012)}, |
91 | {PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, QLGE_DEVICE_ID_8000)}, | 91 | {PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, QLGE_DEVICE_ID_8000)}, |
92 | /* required last entry */ | 92 | /* required last entry */ |