diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-14 20:10:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-14 20:10:33 -0400 |
| commit | a11c5c9ef6dc562fc7df7aaf7911569a85f4d71c (patch) | |
| tree | 6e0a6c7a259287e201ab3e727c8d85286e93159a /drivers/net/ethernet/sun/sungem.c | |
| parent | 179c0ac67b9d947d2de69e9f08a743e7c74a8dce (diff) | |
| parent | 9baa3c34ac4e27f7e062f266f50cc5dbea26a6c1 (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/ethernet/sun/sungem.c')
| -rw-r--r-- | drivers/net/ethernet/sun/sungem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c index 102a66fc54a2..f7415b6bf141 100644 --- a/drivers/net/ethernet/sun/sungem.c +++ b/drivers/net/ethernet/sun/sungem.c | |||
| @@ -85,7 +85,7 @@ MODULE_LICENSE("GPL"); | |||
| 85 | 85 | ||
| 86 | #define GEM_MODULE_NAME "gem" | 86 | #define GEM_MODULE_NAME "gem" |
| 87 | 87 | ||
| 88 | static DEFINE_PCI_DEVICE_TABLE(gem_pci_tbl) = { | 88 | static const struct pci_device_id gem_pci_tbl[] = { |
| 89 | { PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_GEM, | 89 | { PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_GEM, |
| 90 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, | 90 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, |
| 91 | 91 | ||