diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-14 18:10:33 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-14 18:10:33 -0600 |
| commit | a11c5c9ef6dc562fc7df7aaf7911569a85f4d71c (patch) | |
| tree | 6e0a6c7a259287e201ab3e727c8d85286e93159a /drivers/net/irda/donauboe.c | |
| parent | 179c0ac67b9d947d2de69e9f08a743e7c74a8dce (diff) | |
| parent | 9baa3c34ac4e27f7e062f266f50cc5dbea26a6c1 (diff) | |
| download | linux-a11c5c9ef6dc562fc7df7aaf7911569a85f4d71c.tar.bz2 | |
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/irda/donauboe.c')
| -rw-r--r-- | drivers/net/irda/donauboe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c index 6d3e2093bf7f..a87a82ca111f 100644 --- a/drivers/net/irda/donauboe.c +++ b/drivers/net/irda/donauboe.c @@ -184,7 +184,7 @@ #define CONFIG0H_DMA_ON_NORX CONFIG0H_DMA_OFF| OBOE_CONFIG0H_ENDMAC #define CONFIG0H_DMA_ON CONFIG0H_DMA_ON_NORX | OBOE_CONFIG0H_ENRX -static DEFINE_PCI_DEVICE_TABLE(toshoboe_pci_tbl) = { +static const struct pci_device_id toshoboe_pci_tbl[] = { { PCI_VENDOR_ID_TOSHIBA, PCI_DEVICE_ID_FIR701, PCI_ANY_ID, PCI_ANY_ID, }, { PCI_VENDOR_ID_TOSHIBA, PCI_DEVICE_ID_FIRD01, PCI_ANY_ID, PCI_ANY_ID, }, { } /* Terminating entry */ |