aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wan/pci200syn.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-08-14 20:10:33 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-14 20:10:33 -0400
commita11c5c9ef6dc562fc7df7aaf7911569a85f4d71c (patch)
tree6e0a6c7a259287e201ab3e727c8d85286e93159a /drivers/net/wan/pci200syn.c
parent179c0ac67b9d947d2de69e9f08a743e7c74a8dce (diff)
parent9baa3c34ac4e27f7e062f266f50cc5dbea26a6c1 (diff)
Merge tag 'pci-v3.17-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull DEFINE_PCI_DEVICE_TABLE removal from Bjorn Helgaas: "Part two of the PCI changes for v3.17: - Remove DEFINE_PCI_DEVICE_TABLE macro use (Benoit Taine) It's a mechanical change that removes uses of the DEFINE_PCI_DEVICE_TABLE macro. I waited until later in the merge window to reduce conflicts, but it's possible you'll still see a few" * tag 'pci-v3.17-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use
Diffstat (limited to 'drivers/net/wan/pci200syn.c')
-rw-r--r--drivers/net/wan/pci200syn.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/pci200syn.c b/drivers/net/wan/pci200syn.c
index fe4e3ece3c42..e8455621390e 100644
--- a/drivers/net/wan/pci200syn.c
+++ b/drivers/net/wan/pci200syn.c
@@ -414,7 +414,7 @@ static int pci200_pci_init_one(struct pci_dev *pdev,
414 414
415 415
416 416
417static DEFINE_PCI_DEVICE_TABLE(pci200_pci_tbl) = { 417static const struct pci_device_id pci200_pci_tbl[] = {
418 { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_VENDOR_ID_PLX, 418 { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_VENDOR_ID_PLX,
419 PCI_DEVICE_ID_PLX_PCI200SYN, 0, 0, 0 }, 419 PCI_DEVICE_ID_PLX_PCI200SYN, 0, 0, 0 },
420 { 0, } 420 { 0, }