diff options
author | 2018-08-15 14:59:03 -0500 | |
---|---|---|
committer | 2018-08-15 14:59:03 -0500 | |
commit | e7aaf90f9d9dbbba54f67c653a1c56c2bf117268 (patch) | |
tree | 9f00f8d19ad3b4e0432b239c782410a5c7968c4c /include/linux/pci_ids.h | |
parent | Merge branch 'pci/resource' (diff) | |
parent | PCI: Expand documentation for pci_add_dma_alias() (diff) | |
download | linux-e7aaf90f9d9dbbba54f67c653a1c56c2bf117268.tar.gz linux-e7aaf90f9d9dbbba54f67c653a1c56c2bf117268.tar.bz2 linux-e7aaf90f9d9dbbba54f67c653a1c56c2bf117268.zip |
Merge branch 'pci/switchtec'
- Add DMA alias quirk for Microsemi Switchtec NTB (Doug Meyer)
- Expand documentation for pci_add_dma_alias() (Logan Gunthorpe)
* pci/switchtec:
PCI: Expand documentation for pci_add_dma_alias()
PCI: Add DMA alias quirk for Microsemi Switchtec NTB
switchtec: Use generic PCI Vendor ID and Class Code
# Conflicts:
# drivers/pci/quirks.c
Diffstat (limited to 'include/linux/pci_ids.h')
-rw-r--r-- | include/linux/pci_ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 381fc009551d..99d366cb0e9f 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1668,6 +1668,7 @@ #define PCI_DEVICE_ID_COMPEX_ENET100VG4 0x0112 #define PCI_VENDOR_ID_PMC_Sierra 0x11f8 +#define PCI_VENDOR_ID_MICROSEMI 0x11f8 #define PCI_VENDOR_ID_RP 0x11fe #define PCI_DEVICE_ID_RP32INTF 0x0001 |